Patchwork D7365: unshelve: correct help string; unshelve does not accept file list

login
register
mail settings
Submitter phabricator
Date Nov. 8, 2019, 10:35 p.m.
Message ID <70528867214c5216ecc6cf4bb89130e1@localhost.localdomain>
Download mbox | patch
Permalink /patch/42985/
State Not Applicable
Headers show

Comments

phabricator - Nov. 8, 2019, 10:35 p.m.
Closed by commit rHGe0dcfdd1731b: unshelve: correct help string; unshelve does not accept file list (authored by spectral).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7365?vs=17802&id=17804

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

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

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: spectral, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -7525,7 +7525,7 @@ 
             _(b'DATE'),
         ),
     ],
-    _(b'hg unshelve [OPTION]... [FILE]... [-n SHELVED]'),
+    _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
     helpcategory=command.CATEGORY_WORKING_DIRECTORY,
 )
 def unshelve(ui, repo, *shelved, **opts):
@@ -7549,9 +7549,9 @@ 
     that causes a conflict. This reverts the unshelved changes, and
     leaves the bundle in place.)
 
-    If bare shelved change (when no files are specified, without interactive,
-    include and exclude option) was done on newly created branch it would
-    restore branch information to the working directory.
+    If bare shelved change (without interactive, include and exclude
+    option) was done on newly created branch it would restore branch
+    information to the working directory.
 
     After a successful unshelve, the shelved changes are stored in a
     backup directory. Only the N most recent backups are kept. N