Mercurial Mercurial > mercurial / 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: only write in-memory backup during premerge
authorPhil Cohen <phillco@fb.com>
Thu, 04 Jan 2018 21:37:03 -0800
changeset 35703 9a50ffd15b25
parent 35702 c0439e11af16
child 35704 41ef02ba329b
filemerge: only write in-memory backup during premerge This wasn't broken, but should mirror the non-in memory case to save an extra write. Differential Revision: https://phab.mercurial-scm.org/D1807
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/filemerge.py	Thu Jan 04 21:36:58 2018 -0800
+++ b/mercurial/filemerge.py	Thu Jan 04 21:37:03 2018 -0800
@@ -636,7 +636,8 @@
         # merging in-memory, we must redirect the backup to the memory context
         # so we don't disturb the working directory.
         relpath = back[len(repo.wvfs.base) + 1:]
-        wctx[relpath].write(fcd.data(), fcd.flags())
+        if premerge:
+            wctx[relpath].write(fcd.data(), fcd.flags())
         return wctx[relpath]
     else:
         if premerge:
mercurial