diff -r 5a627b49b4d9 -r 5b0a4383cd5e mercurial/commands.py
--- a/mercurial/commands.py	Thu Feb 23 18:05:20 2012 +0100
+++ b/mercurial/commands.py	Fri Feb 24 16:16:48 2012 -0600
@@ -2605,7 +2605,7 @@
             repo.dirstate.setparents(current.node(), nullid)
             repo.dirstate.write()
             # fix up dirstate for copies and renames
-            cmdutil.duplicatecopies(repo, ctx.rev(), current.node())
+            cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
             # report any conflicts
             if stats and stats[3] > 0:
                 # write out state for --continue