This revision was automatically updated to reflect the committed changes. Closed by commit rHG9c07cff039bc: filemerge: flush if using deferred writes when running a merge tool (authored by phillco, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D627?vs=1700&id=1769 REVISION DETAIL https://phab.mercurial-scm.org/D627 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS 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: To: phillco, #hg-reviewers Cc: quark, martinvonz, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel