mercurial/copies.py

10295:44c923eeb81d

                continue # no match, keep looking
            if m2[of] == ma.get(of):
                break # no merge needed, quit early
            c2 = ctx(of, m2[of])
            cr = related(oc, c2, ca.rev())
            if cr and (cr.path() == f or cr.path == c2.path()): # non-divergent
                copy[f] = of
                of = None
                break

        if of in ma:

10298:4a1034687ef7

                continue # no match, keep looking
            if m2[of] == ma.get(of):
                break # no merge needed, quit early
            c2 = ctx(of, m2[of])
            cr = related(oc, c2, ca.rev())
            if of == f or of == c2.path(): # non-divergent
                copy[f] = of
                of = None
                break

        if of in ma: