Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
3714:198173f3957c 3715:6cb3aca69cdc
137 137
138 def checkpair(c, f2, man): 138 def checkpair(c, f2, man):
139 ''' check if an apparent pair actually matches ''' 139 ''' check if an apparent pair actually matches '''
140 c2 = ctx(f2, man[f2]) 140 c2 = ctx(f2, man[f2])
141 ca = c.ancestor(c2) 141 ca = c.ancestor(c2)
142 if c == ca or c2 == ca: 142 if not ca or c == ca or c2 == ca:
143 return 143 return
144 if ca and ca.path() == c.path() or ca.path() == c2.path(): 144 if ca.path() == c.path() or ca.path() == c2.path():
145 copy[c.path()] = f2 145 copy[c.path()] = f2
146 copy[f2] = c.path() 146 copy[f2] = c.path()
147 147
148 for f in u1: 148 for f in u1:
149 c = ctx(dcopies.get(f, f), m1[f]) 149 c = ctx(dcopies.get(f, f), m1[f])