Show More
@@ -386,7 +386,8 b' def recordupdates(repo, action, branchme' | |||||
386 | # of that file some time in the past. Thus our |
|
386 | # of that file some time in the past. Thus our | |
387 | # merge will appear as a normal local file |
|
387 | # merge will appear as a normal local file | |
388 | # modification. |
|
388 | # modification. | |
389 | repo.dirstate.normallookup(fd) |
|
389 | if f2 == fd: # file not locally copied/moved | |
|
390 | repo.dirstate.normallookup(fd) | |||
390 | if move: |
|
391 | if move: | |
391 | repo.dirstate.forget(f) |
|
392 | repo.dirstate.forget(f) | |
392 | elif m == "d": # directory rename |
|
393 | elif m == "d": # directory rename |
General Comments 0
You need to be logged in to leave comments.
Login now