Patchwork D627: filemerge: flush if using deferred writes when running a merge tool

login
register
mail settings
Submitter phabricator
Date Sept. 11, 2017, 3:55 a.m.
Message ID <d352f05c83d1f7460879af3d24ff6f54@localhost.localdomain>
Download mbox | patch
Permalink /patch/23759/
State Not Applicable
Headers show

Comments

phabricator - Sept. 11, 2017, 3:55 a.m.
phillco updated this revision to Diff 1700.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D627?vs=1671&id=1700

REVISION DETAIL
  https://phab.mercurial-scm.org/D627

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS




To: phillco, #hg-reviewers
Cc: quark, martinvonz, mercurial-devel

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -666,6 +666,11 @@ 
         onfailure = _("merging %s failed!\n")
         precheck = None
 
+        # If using deferred writes, must flush any deferred contents if running
+        # an external merge tool since it has arbitrary access to the working
+        # copy.
+        wctx.flushall()
+
     toolconf = tool, toolpath, binary, symlink
 
     if mergetype == nomerge: