changeset 13728 | 15d1db2abfcb |
parent 13561 | 0ab0ceefddf2 |
parent 13718 | 5b3383ea67d2 |
child 13874 | 9d67277c9204 |
--- a/mercurial/merge.py Tue Mar 22 21:27:51 2011 -0500 +++ b/mercurial/merge.py Wed Mar 23 09:20:40 2011 -0500 @@ -338,7 +338,8 @@ else: merged += 1 util.set_flags(repo.wjoin(fd), 'l' in flags, 'x' in flags) - if f != fd and move and os.path.lexists(repo.wjoin(f)): + if (move and repo.dirstate.normalize(fd) != f + and os.path.lexists(repo.wjoin(f))): repo.ui.debug("removing %s\n" % f) os.unlink(repo.wjoin(f)) elif m == "g": # get