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

login
register
mail settings
Submitter phabricator
Date July 24, 2019, 9:28 a.m.
Message ID <df5a421dd2f008c550c5433c89ed7ef0@localhost.localdomain>
Download mbox | patch
Permalink /patch/41035/
State Not Applicable
Headers show

Comments

phabricator - July 24, 2019, 9:28 a.m.
Closed by commit rHG0795bbe8ed19: unshelve: add help text on --interactive in verbose mode (authored by navaneeth.suresh).
This revision was automatically updated to reflect the committed changes.

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D6676?vs=16017&id=16026#toc

REPOSITORY
  rHG Mercurial

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

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, pulkit
Cc: pulkit, 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,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)