author | Matt Mackall <mpm@selenic.com> |
Thu, 03 May 2007 17:24:43 -0500 | |
changeset 4399 | 3b7e284b8f28 |
parent 4398 | 9fe267f77f56 |
child 4400 | 93652499bed3 |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -205,11 +205,14 @@ def findcopies(repo, m1, m2, ma, limit): elif dsrc in dirmove and dirmove[dsrc] != ddst: # files from the same directory moved to two different places invalid[dsrc] = True - del dirmove[dsrc] else: # looks good so far dirmove[dsrc + "/"] = ddst + "/" + for i in invalid: + if i in dirmove: + del dirmove[i] + del d1, d2, invalid if not dirmove: