From patchwork Tue Sep 12 22:30:59 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D673: merge: flush any deferred writes just before recordupdates()
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 23818
Message-Id: <8aef98eff9c8537aa1f26b85353ab136@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Tue, 12 Sep 2017 22:30:59 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG57dc78d757ff: merge: flush any deferred writes just before recordupdates() (authored by phillco, committed by ).

REPOSITORY
  rHG Mercurial

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

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




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

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1712,6 +1712,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():