Mercurial > hg
diff mercurial/copies.py @ 10296:cade47dcac2d
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 28 Jan 2010 23:13:10 -0600 |
parents | 08a0f04b56bd d1cd09bb4d18 |
children | 00099580ca35 |
line wrap: on
line diff
--- a/mercurial/copies.py Thu Jan 28 22:45:04 2010 -0600 +++ b/mercurial/copies.py Thu Jan 28 23:13:10 2010 -0600 @@ -154,7 +154,7 @@ break # no merge needed, quit early c2 = ctx(of, m2[of]) cr = related(oc, c2, ca.rev()) - if of == f or of == c2.path(): # non-divergent + if cr and (cr.path() == f or cr.path == c2.path()): # non-divergent copy[f] = of of = None break