Mercurial > hg
changeset 42622:74ba82abbf29
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
author | Navaneeth Suresh <navaneeths1998@gmail.com> |
---|---|
date | Thu, 18 Jul 2019 20:54:26 +0530 |
parents | 99ebde4fec99 |
children | 9eace8d6d537 |
files | mercurial/commands.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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', '',