Skip to content
Snippets Groups Projects
Commit 1af4561b authored by Phil Cohen's avatar Phil Cohen
Browse files

filemerge: add a missing flushall()

Differential Revision: https://phab.mercurial-scm.org/D1060
parent 123a68e6
No related branches found
No related tags found
No related merge requests found
......@@ -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())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment