comparison mercurial/ancestor.py @ 11418:67bb9d78f05e

merge: sort arguments to stabilize the ancestor search

11417:6f1d1ed3e19a

    pfunc must return a list of parent vertices for a given vertex
    """

    if a == b:
        return a

    # find depth from root of all ancestors
    parentcache = {}
    visit = [a, b]
    depth = {}

11418:67bb9d78f05e

    pfunc must return a list of parent vertices for a given vertex
    """

    if a == b:
        return a

    a, b = sorted([a, b])

    # find depth from root of all ancestors
    parentcache = {}
    visit = [a, b]
    depth = {}