Skip to content
Snippets Groups Projects
Commit 31141fd7 authored by Benoit Boissinot's avatar Benoit Boissinot
Browse files

copies: check if revisions are related (bug found with pylint)

parent 00099580
No related branches found
No related tags found
No related merge requests found
......@@ -154,7 +154,7 @@
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
if cr and (of == f or of == c2.path()): # non-divergent
copy[f] = of
of = None
break
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment