mercurial/copies.py

30187:3e86261bf110

        c2 = getfctx(of, m2[of])
        # c2 might be a plain new file on added on destination side that is
        # unrelated to the droids we are looking for.
        cr = _related(oc, c2, base.rev())
        if cr and (of == f or of == c2.path()): # non-divergent
            data['copy'][f] = of
            return

    if of in mb:
        data['diverge'].setdefault(of, []).append(f)

30188:8a864844d5a0

        c2 = getfctx(of, m2[of])
        # c2 might be a plain new file on added on destination side that is
        # unrelated to the droids we are looking for.
        cr = _related(oc, c2, base.rev())
        if cr and (of == f or of == c2.path()): # non-divergent
            if of in mb:
                data['copy'][f] = of
            return

    if of in mb:
        data['diverge'].setdefault(of, []).append(f)