Skip to content
Snippets Groups Projects
Commit 4a103468 authored by Matt Mackall's avatar Matt Mackall
Browse files

copies: revert d1cd09bb4d18

The behavior of rebase both before and after the fix was actually
incorrect, and this change regressed other parts of copy behavior.
parent 44c923ee
Branches
Tags
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 cr and (cr.path() == f or cr.path == c2.path()): # non-divergent
if 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.
Please register or to comment