unshelve: add help text on --interactive in verbose mode
This is a follow-up patch to rHG
9eace8d6d537. This modifies the
help text of unshelve in verbose mode to mention the details
about `--interactive` flag.
Differential Revision: https://phab.mercurial-scm.org/D6676
--- a/mercurial/commands.py Mon Jul 22 06:33:11 2019 -0400
+++ b/mercurial/commands.py Tue Jul 23 12:03:24 2019 +0530
@@ -6210,6 +6210,14 @@
Timestamp in seconds is used to decide order of backups. More
than ``maxbackups`` backups are kept, if same timestamp
prevents from deciding exact order of them, for safety.
+
+ 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: 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.
"""
with repo.wlock():
return shelvemod.dounshelve(ui, repo, *shelved, **opts)