comparison mercurial/copies.py @ 6277:cfebb175704f

copies: deal with symmetric difference for linear relationships

choose the minimum of symmetric difference and the two revs in question

6276:c93ca83a3354

    if rev2 is None: # c2 is a workingctx
        rev2 = c2.parents()[0].rev()
    pr = repo.changelog.parentrevs
    def parents(rev):
        return [p for p in pr(rev) if p != nullrev]
    limit = min(ancestor.symmetricdifference(rev1, rev2, parents))
    m1 = c1.manifest()
    m2 = c2.manifest()
    ma = ca.manifest()

    def makectx(f, n):

6277:cfebb175704f

    if rev2 is None: # c2 is a workingctx
        rev2 = c2.parents()[0].rev()
    pr = repo.changelog.parentrevs
    def parents(rev):
        return [p for p in pr(rev) if p != nullrev]
    limit = min(ancestor.symmetricdifference(rev1, rev2, parents) + [rev1, rev2])
    m1 = c1.manifest()
    m2 = c2.manifest()
    ma = ca.manifest()

    def makectx(f, n):