Patchwork D6653: unshelve: mark unshelve interactive as experimental

login
register
mail settings
Submitter phabricator
Date July 18, 2019, 3:28 p.m.
Message ID <differential-rev-PHID-DREV-qwl7etpxhpkau72kirqt-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/40967/
State Superseded
Headers show

Comments

phabricator - July 18, 2019, 3:28 p.m.
navaneeth.suresh created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: navaneeth.suresh, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -6143,7 +6143,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', '',