facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity

filemerge: move a util copy call to filectx.write

Browse Source 
This way a future in-memory-merge context can intercept them.

Differential Revision: https://phab.mercurial-scm.org/D400
This commit is contained in:
Phil Cohen 2017-08-31 11:28:59 -07:00
parent bea82440f1
commit 7790af6f63
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/filemerge.py
View File

@ -348,7 +348,9 @@ def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None):
return 0
if premerge not in validkeep:
# restore from backup and try again
util.copyfile(back, repo.wjoin(fcd.path()))
# TODO: Add a workingfilectx.write(otherfilectx) path so we can use
# util.copy here instead.
fcd.write(util.readfile(back), fcd.flags())
return 1 # continue merging
def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf):