mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
filemerge: move a util copy call to filectx.write
This way a future in-memory-merge context can intercept them. Differential Revision: https://phab.mercurial-scm.org/D400
This commit is contained in:
parent
bea82440f1
commit
7790af6f63
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user