equal
deleted
inserted
replaced
467 |
467 |
468 # Run ``flushall()`` to make any missing folders the following wwrite |
468 # Run ``flushall()`` to make any missing folders the following wwrite |
469 # calls might be depending on. |
469 # calls might be depending on. |
470 from . import context |
470 from . import context |
471 if isinstance(fcd, context.overlayworkingfilectx): |
471 if isinstance(fcd, context.overlayworkingfilectx): |
472 fcd.ctx().flushall() |
472 fcd.changectx().flushall() |
473 |
473 |
474 util.writefile(a + ".local", fcd.decodeddata()) |
474 util.writefile(a + ".local", fcd.decodeddata()) |
475 repo.wwrite(fd + ".other", fco.data(), fco.flags()) |
475 repo.wwrite(fd + ".other", fco.data(), fco.flags()) |
476 repo.wwrite(fd + ".base", fca.data(), fca.flags()) |
476 repo.wwrite(fd + ".base", fca.data(), fca.flags()) |
477 return False, 1, False |
477 return False, 1, False |