Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unshelve: mark unshelve interactive as experimental
authorNavaneeth Suresh <navaneeths1998@gmail.com>
Thu, 18 Jul 2019 20:54:26 +0530
changeset 42622 74ba82abbf29
parent 42621 99ebde4fec99
child 42623 9eace8d6d537
unshelve: mark unshelve interactive as experimental This is a follow-up patch to rHG5162753c4c14. We have the logic for interactive unshelve under `_rebaserestorecommit()`. So, we might get conflicts even if there are conflicting changes other than selected changes by the user. We should mark unshelve `--interactive` as `EXPERIMENTAL` until we solve this issue. Differential Revision: https://phab.mercurial-scm.org/D6653
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Tue Jul 02 12:59:58 2019 -0400
+++ b/mercurial/commands.py	Thu Jul 18 20:54:26 2019 +0530
@@ -6169,7 +6169,7 @@
           ('c', 'continue', None,
            _('continue an incomplete unshelve operation')),
           ('i', 'interactive', None,
-           _('use interactive mode')),
+           _('use interactive mode (EXPERIMENTAL)')),
           ('k', 'keep', None,
            _('keep shelve after unshelving')),
           ('n', 'name', '',
Mercurial