changeset 11178 | 21a7ae13208f |
parent 11101 | 502474839293 |
child 11417 | 6f1d1ed3e19a |
--- a/mercurial/merge.py Sat May 15 17:48:49 2010 -0500 +++ b/mercurial/merge.py Tue May 04 09:57:16 2010 +0200 @@ -386,7 +386,8 @@ # of that file some time in the past. Thus our # merge will appear as a normal local file # modification. - repo.dirstate.normallookup(fd) + if f2 == fd: # file not locally copied/moved + repo.dirstate.normallookup(fd) if move: repo.dirstate.forget(f) elif m == "d": # directory rename