Patchwork D6676: unshelve: add help text on --interactive in verbose mode

login
register
mail settings
Submitter phabricator
Date July 23, 2019, 5:39 p.m.
Message ID <0e02cf9ab083e8a4207c2410f9daec5d@localhost.localdomain>
Download mbox | patch
Permalink /patch/41022/
State Not Applicable
Headers show

Comments

phabricator - July 23, 2019, 5:39 p.m.
navaneeth.suresh updated this revision to Diff 16017.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6676?vs=16016&id=16017

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6676/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6676

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: navaneeth.suresh, #hg-reviewers
Cc: mharbison72, mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -6210,6 +6210,12 @@ 
        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 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.
     """
     with repo.wlock():
         return shelvemod.dounshelve(ui, repo, *shelved, **opts)