# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 2019-03-22 15:24:23
# Node ID 22278dae287c74017c5d5ad829ba0d5f70008bd1
# Parent  db26dbbee74de9cbced507fd9466de42457f0ea5

shelve: new keep option

Does nothing yet. The docstring describes what it will soon be doing.

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -1055,6 +1055,8 @@ def _dounshelve(ui, repo, *shelved, **op
            _('delete the named shelved change(s)')),
           ('e', 'edit', False,
            _('invoke editor on commit messages')),
+          ('k', 'keep', False,
+           _('shelve, but keep changes in the working directory')),
           ('l', 'list', None,
            _('list current shelves')),
           ('m', 'message', '',
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -76,6 +76,7 @@ shelve has a help message
       --date DATE           shelve with the specified commit date
    -d --delete              delete the named shelved change(s)
    -e --edit                invoke editor on commit messages
+   -k --keep                shelve, but keep changes in the working directory
    -l --list                list current shelves
    -m --message TEXT        use text as shelve message
    -n --name NAME           use the given name for the shelved commit