Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 16166:5b0a4383cd5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 24 Feb 2012 16:16:48 -0600
parents 7ee1d0dd7ca3 807f796e9b1a
children 0bb0b9f22cd7
line wrap: on
line diff
--- 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