Mercurial > hg-stable
changeset 38465:8459e8d2f729
shelve: check the actual shelvestate in morestatus
The rebasestate is a lower level implementation details that we are trying to
remove.
Differential Revision: https://phab.mercurial-scm.org/D3687
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Mon, 28 May 2018 20:51:20 +0200 |
| parents | 7f738edc4a27 |
| children | 61e4cf1be5b2 |
| files | mercurial/cmdutil.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sat May 12 18:44:03 2018 -0700 +++ b/mercurial/cmdutil.py Mon May 28 20:51:20 2018 +0200 @@ -631,7 +631,7 @@ ('histedit', fileexistspredicate('histedit-state'), _histeditmsg), ('bisect', fileexistspredicate('bisect.state'), _bisectmsg), ('graft', fileexistspredicate('graftstate'), _graftmsg), - ('unshelve', fileexistspredicate('unshelverebasestate'), _unshelvemsg), + ('unshelve', fileexistspredicate('shelvedstate'), _unshelvemsg), ('rebase', fileexistspredicate('rebasestate'), _rebasemsg), # The merge state is part of a list that will be iterated over. # They need to be last because some of the other unfinished states may also