Mercurial > public > mercurial-scm > hg

comparison mercurial/copies.py @ 10294:d1cd09bb4d18 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: fix issue1994 Unscramble divergence test
author Matt Mackall <mpm@selenic.com>
date Thu, 28 Jan 2010 22:45:46 -0600
parents 25e572394f5c
children cade47dcac2d 4a1034687ef7
comparison
equal deleted inserted replaced
10284:b08ffd27dfc8 10294:d1cd09bb4d18
152 continue # no match, keep looking 152 continue # no match, keep looking
153 if m2[of] == ma.get(of): 153 if m2[of] == ma.get(of):
154 break # no merge needed, quit early 154 break # no merge needed, quit early
155 c2 = ctx(of, m2[of]) 155 c2 = ctx(of, m2[of])
156 cr = related(oc, c2, ca.rev()) 156 cr = related(oc, c2, ca.rev())
157 if of == f or of == c2.path(): # non-divergent 157 if cr and (cr.path() == f or cr.path == c2.path()): # non-divergent
158 copy[f] = of 158 copy[f] = of
159 of = None 159 of = None
160 break 160 break
161 161
162 if of in ma: 162 if of in ma: