Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 42622:74ba82abbf29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5162753c4c14
children 9eace8d6d537
comparison
equal deleted inserted replaced
42621:99ebde4fec99 42622:74ba82abbf29
6167 [('a', 'abort', None, 6167 [('a', 'abort', None,
6168 _('abort an incomplete unshelve operation')), 6168 _('abort an incomplete unshelve operation')),
6169 ('c', 'continue', None, 6169 ('c', 'continue', None,
6170 _('continue an incomplete unshelve operation')), 6170 _('continue an incomplete unshelve operation')),
6171 ('i', 'interactive', None, 6171 ('i', 'interactive', None,
6172 _('use interactive mode')), 6172 _('use interactive mode (EXPERIMENTAL)')),
6173 ('k', 'keep', None, 6173 ('k', 'keep', None,
6174 _('keep shelve after unshelving')), 6174 _('keep shelve after unshelving')),
6175 ('n', 'name', '', 6175 ('n', 'name', '',
6176 _('restore shelved change with given name'), _('NAME')), 6176 _('restore shelved change with given name'), _('NAME')),
6177 ('t', 'tool', '', _('specify merge tool')), 6177 ('t', 'tool', '', _('specify merge tool')),