branch | stable |
changeset 15976 | d1c74c6151c9 |
parent 15775 | 91eb4512edd0 |
child 15994 | 3c2ce5c2cee0 |
--- a/mercurial/copies.py Sat Jan 21 21:39:27 2012 -0600 +++ b/mercurial/copies.py Tue Jan 24 17:16:29 2012 -0600 @@ -99,6 +99,13 @@ if v in src: # file is a copy of an existing file t[k] = v + + # remove criss-crossed copies + for k, v in t.items(): + if k in src and v in dst: + print "bad", k, v + del t[k] + return t def _tracefile(fctx, actx):