diff -r 9f2189b6bf2a -r 5c285c8e4f98 mercurial/shelve.py --- a/mercurial/shelve.py Tue Aug 20 18:35:16 2019 +0300 +++ b/mercurial/shelve.py Thu Aug 15 20:43:25 2019 +0530 @@ -942,6 +942,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'))