comparison mercurial/filemerge.py @ 34785:1af4561b6bfe

filemerge: add a missing flushall()

Differential Revision: https://phab.mercurial-scm.org/D1060

34784:123a68e6b473

    runs successfully. Use :forcedump to forcibly write files out.
    """
    a = _workingpath(repo, fcd)
    fd = fcd.path()

    util.writefile(a + ".local", fcd.decodeddata())
    repo.wwrite(fd + ".other", fco.data(), fco.flags())
    repo.wwrite(fd + ".base", fca.data(), fca.flags())
    return False, 1, False

34785:1af4561b6bfe

    runs successfully. Use :forcedump to forcibly write files out.
    """
    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())
    return False, 1, False