mercurial/cmdutil.py

--- a/mercurial/cmdutil.py	Fri Mar 29 19:54:06 2013 -0700
+++ b/mercurial/cmdutil.py	Thu Mar 28 00:14:27 2013 -0700
@@ -1590,9 +1590,9 @@
     forgot.extend(forget)
     return bad, forgot
 
-def duplicatecopies(repo, rev, p1):
-    "Reproduce copies found in the source revision in the dirstate for grafts"
-    for dst, src in copies.pathcopies(repo[p1], repo[rev]).iteritems():
+def duplicatecopies(repo, rev, fromrev):
+    '''reproduce copies from fromrev to rev in the dirstate'''
+    for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems():
         repo.dirstate.copy(src, dst)
 
 def commit(ui, repo, commitfunc, pats, opts):