Mercurial > hg

changeset 21578:7cfe51661e98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: explicitly get status against the parent This makes absolutely no functional changes. The default value for node1 is already the same as the current value of parent. But to be able to properly use the second parent in merge context, we have to start to be a bit more explicit about what we compute the status against.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 14 May 2014 10:37:25 -0700
parents c62c5ce750ee
children 87a972b5c039
files mercurial/cmdutil.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Tue May 13 17:28:19 2014 -0700
+++ b/mercurial/cmdutil.py	Wed May 14 10:37:25 2014 -0700
@@ -2298,7 +2298,7 @@
 
         # Find status of all file in `names`. (Against working directory parent)
         m = scmutil.matchfiles(repo, names)
-        changes = repo.status(match=m)[:4]
+        changes = repo.status(node1=parent, match=m)[:4]
         modified, added, removed, deleted = map(set, changes)
 
         # if f is a rename, update `names` to also revert the source