Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: move a util copy call to filectx.write
authorPhil Cohen <phillco@fb.com>
Thu, 31 Aug 2017 11:28:59 -0700
changeset 34050 d37f1bb68169
parent 34049 67cfffbfb6a0
child 34051 7558917f291e
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
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/filemerge.py	Thu Aug 31 11:28:59 2017 -0700
+++ b/mercurial/filemerge.py	Thu Aug 31 11:28:59 2017 -0700
@@ -348,7 +348,9 @@
             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):
hg-stable