mercurial/merge.py

44089:bd22e90c54b3

    with repo.dirstate.parentchange():
        repo.setparents(pctx.node(), pother)
        repo.dirstate.write(repo.currenttransaction())
        # fix up dirstate for copies and renames
        copies.duplicatecopies(repo, wctx, ctx.rev(), base.rev())
    return stats


def purge(
    repo,

44090:2f0a44c69e07

    with repo.dirstate.parentchange():
        repo.setparents(pctx.node(), pother)
        repo.dirstate.write(repo.currenttransaction())
        # fix up dirstate for copies and renames
        copies.graftcopies(repo, wctx, ctx, base)
    return stats


def purge(
    repo,