# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1330121355 21600
# Node ID 807f796e9b1ac44c5410e086dffb16ff779945bc
# Parent  7e279d4756699673668f1cec81b899ccaddd2bd7
graft: use proper revisions for copy detection (issue3265)

diff -r 7e279d475669 -r 807f796e9b1a mercurial/commands.py
--- a/mercurial/commands.py	Fri Feb 24 19:11:35 2012 -0200
+++ b/mercurial/commands.py	Fri Feb 24 16:09:15 2012 -0600
@@ -2601,7 +2601,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