Comments
Patch
@@ -1456,3 +1456,8 @@
record this change to 'bar2'?
(enter ? for help) [Ynesfdaq?] y
+-- test for --interactive --keep
+ $ hg unshelve -i --keep
+ unshelving change 'default'
+ abort: --keep on interactive is not yet supported
+ [255]
@@ -967,6 +967,8 @@
ui.status(_("unshelving change '%s'\n") % basename)
else:
basename = shelved[0]
+ if interactive and opts.get('keep'):
+ raise error.Abort(_('--keep on interactive is not yet supported'))
if not shelvedfile(repo, basename, patchextension).exists():
raise error.Abort(_("shelved change '%s' not found") % basename)