From b481a15354efa001e3ebfa9fa7ebc1bbb36bf509 Mon Sep 17 00:00:00 2001 From: Phil Cohen Date: Mon, 11 Sep 2017 13:17:43 -0700 Subject: [PATCH] merge: flush any deferred writes just before recordupdates() ``recordupdates`` calls into the dirstate which requires the files to be there, so this is the last possible moment we can flush anything. Differential Revision: https://phab.mercurial-scm.org/D673 --- mercurial/merge.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mercurial/merge.py b/mercurial/merge.py index f7d214b7cf..1ec0f93822 100644 --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1712,6 +1712,7 @@ def update(repo, node, branchmerge, force, ancestor=None, repo.vfs.write('updatestate', p2.hex()) stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) + wc.flushall() if not partial: with repo.dirstate.parentchange():