Mercurial > hg-stable

changeset 6422:3ee6f1fce94a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: fix silly precedence bug
author Matt Mackall <mpm@selenic.com>
date Sat, 29 Mar 2008 12:39:47 -0500
parents ecde0baee570
children fb374b1b3911
files mercurial/copies.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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: