Patchwork D673: merge: flush any deferred writes just before recordupdates()

login
register
mail settings
Submitter phabricator
Date Sept. 11, 2017, 8:30 p.m.
Message ID <788dcc449c8a2905c8d3cc3b64d9ab7a@localhost.localdomain>
Download mbox | patch
Permalink /patch/23792/
State Not Applicable
Headers show

Comments

phabricator - Sept. 11, 2017, 8:30 p.m.
phillco updated this revision to Diff 1728.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D673?vs=1703&id=1728

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1697,6 +1697,7 @@ 
             repo.vfs.write('updatestate', p2.hex())
 
         stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)
+        wc.flushall()
 
         if not partial:
             with repo.dirstate.parentchange():