Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: fix silly precedence bug
authorMatt Mackall <mpm@selenic.com>
Sat, 29 Mar 2008 12:39:47 -0500
changeset 6422 3ee6f1fce94a
parent 6421 ecde0baee570
child 6423 fb374b1b3911
copies: fix silly precedence bug
mercurial/copies.py file | annotate | diff | comparison | revisions 
--- 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:
Mercurial