changeset 6422 | 3ee6f1fce94a |
parent 6283 | 5a45c82fc7da |
child 6424 | d8f44384c3ee |
--- a/mercurial/copies.py Fri Mar 28 11:17:10 2008 +0300 +++ b/mercurial/copies.py Sat Mar 29 12:39:47 2008 -0500 @@ -97,7 +97,7 @@ c2 = ctx(of, m2[of]) ca = c1.ancestor(c2) # related and named changed on only one side? - if ca and ca.path() == f or ca.path() == c2.path(): + if ca and (ca.path() == f or ca.path() == c2.path()): if c1 != ca or c2 != ca: # merge needed? copy[f] = of elif of in ma: