Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 21579:87a972b5c039

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: use p2 as parent when reverting against it revert was always using p1 as parent. This created some minor misbehavior when reverting against p2. See test change for an example of that. This is also a useful cleanup for coming refactoring to revert.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 14 May 2014 10:38:05 -0700
parents 7cfe51661e98
children 503bb3af70fe
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Wed May 14 10:37:25 2014 -0700
+++ b/mercurial/cmdutil.py	Wed May 14 10:38:05 2014 -0700
@@ -2250,6 +2250,8 @@
     node = ctx.node()
 
     mf = ctx.manifest()
+    if node == p2:
+        parent = p2
     if node == parent:
         pmf = mf
     else: