changeset 3295 | 764688cf51e5 |
parent 3280 | ae85272b59a4 |
child 3301 | 72d1e521da77 |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -359,6 +359,8 @@ def recordupdates(repo, action, branchme repo.dirstate.update([f], 'r') if f != fd: repo.dirstate.copy(f, fd) + else: + repo.dirstate.copy(f2, fd) def update(repo, node, branchmerge=False, force=False, partial=None, wlock=None, show_stats=True, remind=True):