##// END OF EJS Templates
checkcopies: add an inline comment about the '_related' call...
Pierre-Yves David -
r30137:f85f9e06 default
parent child Browse files
Show More
@@ -526,6 +526,8 b' def _checkcopies(ctx, f, m1, m2, base, l'
526 if m2[of] == mb.get(of):
526 if m2[of] == mb.get(of):
527 return # no merge needed, quit early
527 return # no merge needed, quit early
528 c2 = getfctx(of, m2[of])
528 c2 = getfctx(of, m2[of])
529 # c2 might be a plain new file on added on destination side that is
530 # unrelated to the droids we are looking for.
529 cr = _related(oc, c2, base.rev())
531 cr = _related(oc, c2, base.rev())
530 if cr and (of == f or of == c2.path()): # non-divergent
532 if cr and (of == f or of == c2.path()): # non-divergent
531 copy[f] = of
533 copy[f] = of
General Comments 0
You need to be logged in to leave comments. Login now