comparison mercurial/filemerge.py @ 34033:d37f1bb68169

filemerge: move a util copy call to filectx.write

This way a future in-memory-merge context can intercept them.

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

34032:67cfffbfb6a0

        if not r:
            ui.debug(" premerge successful\n")
            return 0
        if premerge not in validkeep:
            # restore from backup and try again
            util.copyfile(back, repo.wjoin(fcd.path()))
    return 1 # continue merging

def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf):
    tool, toolpath, binary, symlink = toolconf
    if symlink:

34033:d37f1bb68169

        if not r:
            ui.debug(" premerge successful\n")
            return 0
        if premerge not in validkeep:
            # restore from backup and try again
            # TODO: Add a workingfilectx.write(otherfilectx) path so we can use
            # util.copy here instead.
            fcd.write(util.readfile(back), fcd.flags())
    return 1 # continue merging

def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf):
    tool, toolpath, binary, symlink = toolconf
    if symlink: