# HG changeset patch # User Boris Feld <boris.f...@octobus.net> # Date 1527533480 -7200 # Mon May 28 20:51:20 2018 +0200 # Node ID 17031851e658c75dd019baecad04d122497eb697 # Parent 95e65e2850cf1ebf3e741995ef830fd4943308a6 # EXP-Topic graftshelve # Available At https://bitbucket.org/octobus/mercurial-devel/ # hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 17031851e658 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 diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -630,7 +630,7 @@ STATES = ( ('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 _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel