##// END OF EJS Templates
copies: check if revisions are related (bug found with pylint)
Benoit Boissinot -
r10313:31141fd7 default
parent child Browse files
Show More
@@ -154,7 +154,7 b' def copies(repo, c1, c2, ca, checkdirs=F'
154 154 break # no merge needed, quit early
155 155 c2 = ctx(of, m2[of])
156 156 cr = related(oc, c2, ca.rev())
157 if of == f or of == c2.path(): # non-divergent
157 if cr and (of == f or of == c2.path()): # non-divergent
158 158 copy[f] = of
159 159 of = None
160 160 break
General Comments 0
You need to be logged in to leave comments. Login now