changeset 12683 | ada47c38f4e5 |
parent 10874 | 4f11978ae45d |
child 13878 | a8d13ee0ce68 |
--- a/mercurial/copies.py Sat Oct 09 11:02:11 2010 -0500 +++ b/mercurial/copies.py Sun Oct 10 09:48:37 2010 -0500 @@ -195,8 +195,8 @@ diverge2 = set() for of, fl in diverge.items(): - if len(fl) == 1: - del diverge[of] # not actually divergent + if len(fl) == 1 or of in c2: + del diverge[of] # not actually divergent, or not a rename else: diverge2.update(fl) # reverse map for below