Mercurial > public > mercurial-scm > hg

comparison mercurial/copies.py @ 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 5a45c82fc7da
children d8f44384c3ee
comparison
equal deleted inserted replaced
6421:ecde0baee570 6422:3ee6f1fce94a
95 # no merge needed 95 # no merge needed
96 if m2[of] != ma.get(of): 96 if m2[of] != ma.get(of):
97 c2 = ctx(of, m2[of]) 97 c2 = ctx(of, m2[of])
98 ca = c1.ancestor(c2) 98 ca = c1.ancestor(c2)
99 # related and named changed on only one side? 99 # related and named changed on only one side?
100 if ca and ca.path() == f or ca.path() == c2.path(): 100 if ca and (ca.path() == f or ca.path() == c2.path()):
101 if c1 != ca or c2 != ca: # merge needed? 101 if c1 != ca or c2 != ca: # merge needed?
102 copy[f] = of 102 copy[f] = of
103 elif of in ma: 103 elif of in ma:
104 diverge.setdefault(of, []).append(f) 104 diverge.setdefault(of, []).append(f)
105 105