equal
deleted
inserted
replaced
384 # We've update-merged a locally modified file, so |
384 # We've update-merged a locally modified file, so |
385 # we set the dirstate to emulate a normal checkout |
385 # we set the dirstate to emulate a normal checkout |
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 |
393 f2, fd, flag = a[2:] |
394 f2, fd, flag = a[2:] |
394 if not f2 and f not in repo.dirstate: |
395 if not f2 and f not in repo.dirstate: |