# HG changeset patch # User Navaneeth Suresh # Date 1563463466 -19800 # Node ID 74ba82abbf2976fb2802f769f8c5b38a712b60db # Parent 99ebde4fec9967c2e80f85702129abf874eefe74 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 diff -r 99ebde4fec99 -r 74ba82abbf29 mercurial/commands.py --- 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', '',