# HG changeset patch
# User Phil Cohen <phillco@fb.com>
# Date 2017-09-11 20:17:43
# Node ID 57dc78d757ff05c90581b89916a4667216207e4f
# Parent  b90e5b2a9c822797b7fe6266af00923105deda2d

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

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