##// END OF EJS Templates
copies: fix silly precedence bug
Matt Mackall -
r6422:3ee6f1fc default
parent child Browse files
Show More
@@ -97,7 +97,7 b' def copies(repo, c1, c2, ca):'
97 c2 = ctx(of, m2[of])
97 c2 = ctx(of, m2[of])
98 ca = c1.ancestor(c2)
98 ca = c1.ancestor(c2)
99 # related and named changed on only one side?
99 # related and named changed on only one side?
100 if ca and ca.path() == f or ca.path() == c2.path():
100 if ca and (ca.path() == f or ca.path() == c2.path()):
101 if c1 != ca or c2 != ca: # merge needed?
101 if c1 != ca or c2 != ca: # merge needed?
102 copy[f] = of
102 copy[f] = of
103 elif of in ma:
103 elif of in ma:
General Comments 0
You need to be logged in to leave comments. Login now