Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: use proper revisions for copy detection (issue3265) stable
authorMatt Mackall <mpm@selenic.com>
Fri, 24 Feb 2012 16:09:15 -0600
branchstable
changeset 16163 807f796e9b1a
parent 16162 7e279d475669
child 16164 18743c4d1989
graft: use proper revisions for copy detection (issue3265)
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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
hg-stable