Show More
@@ -467,6 +467,12 b' def _idump(repo, mynode, orig, fcd, fco,' | |||||
467 | a = _workingpath(repo, fcd) |
|
467 | a = _workingpath(repo, fcd) | |
468 | fd = fcd.path() |
|
468 | fd = fcd.path() | |
469 |
|
469 | |||
|
470 | # Run ``flushall()`` to make any missing folders the following wwrite | |||
|
471 | # calls might be depending on. | |||
|
472 | from . import context | |||
|
473 | if isinstance(fcd, context.overlayworkingfilectx): | |||
|
474 | fcd.ctx().flushall() | |||
|
475 | ||||
470 | util.writefile(a + ".local", fcd.decodeddata()) |
|
476 | util.writefile(a + ".local", fcd.decodeddata()) | |
471 | repo.wwrite(fd + ".other", fco.data(), fco.flags()) |
|
477 | repo.wwrite(fd + ".other", fco.data(), fco.flags()) | |
472 | repo.wwrite(fd + ".base", fca.data(), fca.flags()) |
|
478 | repo.wwrite(fd + ".base", fca.data(), fca.flags()) |
General Comments 0
You need to be logged in to leave comments.
Login now