comparison mercurial/merge.py @ 42918:f059d6ffcdf0

merge with stable

42916:96b22e58dc67

    stats = update(repo, ctx.node(), True, True, pctx.node(),
                   mergeancestor=mergeancestor, labels=labels)


    if keepconflictparent and stats.unresolvedcount:
        pother = ctx.node()
    else:
        pother = nullid
        parents = ctx.parents()
        if keepparent and len(parents) == 2 and pctx in parents:
            parents.remove(pctx)
            pother = parents[0].node()

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

42918:f059d6ffcdf0

    stats = update(repo, ctx.node(), True, True, pctx.node(),
                   mergeancestor=mergeancestor, labels=labels)


    potherp1 = False
    if keepconflictparent and stats.unresolvedcount:
        pother = ctx.node()
    else:
        pother = nullid
        parents = ctx.parents()
        if keepparent and len(parents) == 2 and pctx in parents:
            if pctx == parents[0]:
                potherp1 = True
            parents.remove(pctx)
            pother = parents[0].node()

    with repo.dirstate.parentchange():
        if potherp1:
            repo.setparents(pother, repo['.'].node())
        else:
            repo.setparents(repo['.'].node(), pother)
        repo.dirstate.write(repo.currenttransaction())
        # fix up dirstate for copies and renames
        copies.duplicatecopies(repo, repo[None], ctx.rev(), pctx.rev())
    return stats