comparison mercurial/merge.py @ 42953:085295f82845 stable

merge: respect parents order when using `graft` on a merge, this time for real

See a4ca0610c754.

potherp1 is a boolean variable that means "pother is ctx.p1", and parents is
naturally [ctx.p1, ctx.p2].

pctx is always removed from parents, so if pctx is parents[0], then we end up
using parents[1] as pother. To be true to its name, potherp1 should then be
True only when pctx is at parents[1].

42917:e26c2440a030

        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():

42953:085295f82845

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

    with repo.dirstate.parentchange():