diff -r 371cff9610cd -r 0bd17a4bed88 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Tue Jan 03 17:13:03 2012 -0600
+++ b/mercurial/cmdutil.py	Wed Jan 04 15:48:02 2012 -0600
@@ -1201,7 +1201,7 @@
 def duplicatecopies(repo, rev, p1, p2):
     "Reproduce copies found in the source revision in the dirstate for grafts"
     # Here we simulate the copies and renames in the source changeset
-    cop, diver = copies.copies(repo, repo[rev], repo[p1], repo[p2], True)
+    cop, diver = copies.mergecopies(repo, repo[rev], repo[p1], repo[p2])
     m1 = repo[rev].manifest()
     m2 = repo[p1].manifest()
     for k, v in cop.iteritems():