filemerge: add a missing flushall()
Differential Revision: https://phab.mercurial-scm.org/D1060
--- a/mercurial/filemerge.py Fri Oct 13 12:34:22 2017 -0700
+++ b/mercurial/filemerge.py Sun Oct 15 20:36:29 2017 -0700
@@ -467,6 +467,12 @@
a = _workingpath(repo, fcd)
fd = fcd.path()
+ # Run ``flushall()`` to make any missing folders the following wwrite
+ # calls might be depending on.
+ from . import context
+ if isinstance(fcd, context.overlayworkingfilectx):
+ fcd.ctx().flushall()
+
util.writefile(a + ".local", fcd.decodeddata())
repo.wwrite(fd + ".other", fco.data(), fco.flags())
repo.wwrite(fd + ".base", fca.data(), fca.flags())