Show More
@@ -524,13 +524,12 b' def _checkcopies(ctx, f, m1, m2, ca, lim' | |||||
524 | if of not in m2: |
|
524 | if of not in m2: | |
525 | continue # no match, keep looking |
|
525 | continue # no match, keep looking | |
526 | if m2[of] == ma.get(of): |
|
526 | if m2[of] == ma.get(of): | |
527 |
|
|
527 | return # no merge needed, quit early | |
528 | c2 = getfctx(of, m2[of]) |
|
528 | c2 = getfctx(of, m2[of]) | |
529 | cr = _related(oc, c2, ca.rev()) |
|
529 | cr = _related(oc, c2, ca.rev()) | |
530 | if cr and (of == f or of == c2.path()): # non-divergent |
|
530 | if cr and (of == f or of == c2.path()): # non-divergent | |
531 | copy[f] = of |
|
531 | copy[f] = of | |
532 |
|
|
532 | return | |
533 | break |
|
|||
534 |
|
533 | |||
535 | if of in ma: |
|
534 | if of in ma: | |
536 | diverge.setdefault(of, []).append(f) |
|
535 | diverge.setdefault(of, []).append(f) |
General Comments 0
You need to be logged in to leave comments.
Login now