# HG changeset patch # User Jordi GutiƩrrez Hermoso # Date 1553472793 14400 # Node ID 00c1ee0f746a5f427e81e6d18e681f6a70a2639d # Parent 5a1e621b8186095852a4a7112b682d67b52b70c7 shelve: add --keep to list of allowables diff -r 5a1e621b8186 -r 00c1ee0f746a hgext/shelve.py --- a/hgext/shelve.py Sun Mar 17 12:30:52 2019 +0000 +++ b/hgext/shelve.py Sun Mar 24 20:13:13 2019 -0400 @@ -1120,6 +1120,7 @@ # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests ('delete', {'delete'}), ('edit', {'create'}), + ('keep', {'create'}), ('list', {'list'}), ('message', {'create'}), ('name', {'create'}), diff -r 5a1e621b8186 -r 00c1ee0f746a tests/test-shelve.t --- a/tests/test-shelve.t Sun Mar 17 12:30:52 2019 +0000 +++ b/tests/test-shelve.t Sun Mar 24 20:13:13 2019 -0400 @@ -933,6 +933,15 @@ $ hg unshelve unshelving change 'default' + $ hg shelve --keep --list + abort: options '--list' and '--keep' may not be used together + [255] + $ hg shelve --keep --patch + abort: options '--patch' and '--keep' may not be used together + [255] + $ hg shelve --keep --delete + abort: options '--delete' and '--keep' may not be used together + [255] $ hg shelve --keep shelved as default $ hg diff