D6676: unshelve: add help text on --interactive in verbose mode
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Wed Jul 24 08:05:05 EDT 2019
pulkit added a comment.
In D6676#97793 <https://phab.mercurial-scm.org/D6676#97793>, @mharbison72 wrote:
> Maybe I’m looking at something wrong, but it looks like a couple references to “the shelve” snuck in after the last edit in diff 16017.
Ah, forgot to mention, I edited the `Note:` part in flight a bit.
diff --git a/mercurial/commands.py b/mercurial/commands.py
@@ -6213,9 +6213,11 @@ def unshelve(ui, repo, *shelved, **opts)
Selected changes can be unshelved with ``--interactive`` flag.
The working directory is updated with the selected changes, and
- only the unselected changes remain shelved. Note that the user will
- get into conflicts whenever the shelved change has conflicts with
- the working directory regardless of the changes requested by the user .
+ only the unselected changes remain shelved.
+ Note: The whole shelve is applied to working directory first before
+ running interactively. So, this will bring up all the conflicts between
+ working directory and the shelve, irrespective of which changes will be
+ unshelved .
return shelvemod.dounshelve(ui, repo, *shelved, **opts)
CHANGES SINCE LAST ACTION
To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mharbison72, mercurial-devel
More information about the Mercurial-devel