diff -r 0b5d626b354e -r 764688cf51e5 mercurial/merge.py
--- a/mercurial/merge.py	Sat Oct 07 15:16:47 2006 -0400
+++ b/mercurial/merge.py	Sun Oct 08 19:57:45 2006 -0500
@@ -359,6 +359,8 @@
                 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):