Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 3715:6cb3aca69cdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make context __eq__ handle arbitrary RHS values
author Brendan Cully <brendan@kublai.com>
date Mon, 27 Nov 2006 15:27:09 -0800
parents 91690473856c
children 0fb66912040a
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Nov 27 15:13:01 2006 -0800
+++ b/mercurial/merge.py	Mon Nov 27 15:27:09 2006 -0800
@@ -139,9 +139,9 @@
         ''' check if an apparent pair actually matches '''
         c2 = ctx(f2, man[f2])
         ca = c.ancestor(c2)
-        if c == ca or c2 == ca:
+        if not ca or c == ca or c2 == ca:
             return
-        if ca and ca.path() == c.path() or ca.path() == c2.path():
+        if ca.path() == c.path() or ca.path() == c2.path():
             copy[c.path()] = f2
             copy[f2] = c.path()