# HG changeset patch # User Pierre-Yves David # Date 1400089045 25200 # Node ID 7cfe51661e98ae7688f0c6a1a15f241e7df711cd # Parent c62c5ce750ee4e569d9bfd7cbd04a2cf4060107d 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. diff -r c62c5ce750ee -r 7cfe51661e98 mercurial/cmdutil.py --- 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