diff --git a/mercurial/shelve.py b/mercurial/shelve.py --- a/mercurial/shelve.py +++ b/mercurial/shelve.py @@ -941,6 +941,8 @@ if opts.get("name"): shelved.append(opts["name"]) + if interactive and opts.get('keep'): + raise error.Abort(_('--keep on --interactive is not yet supported')) if abortf or continuef: if abortf and continuef: raise error.Abort(_('cannot use both abort and continue')) diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -1456,3 +1456,7 @@ record this change to 'bar2'? (enter ? for help) [Ynesfdaq?] y +-- test for --interactive --keep + $ hg unshelve -i --keep + abort: --keep on --interactive is not yet supported + [255]