diff -r 4814d993fe21 -r 073cfff9aaef mercurial/shelve.py
--- a/mercurial/shelve.py	Wed Jul 24 18:15:27 2019 +0530
+++ b/mercurial/shelve.py	Thu Jul 25 22:01:15 2019 +0530
@@ -750,8 +750,8 @@
         if not phases.supportinternal(repo):
             repair.strip(ui, repo, state.nodestoremove, backup=False,
                          topic='shelve')
+        shelvedstate.clear(repo)
         if not ispartialunshelve:
-            shelvedstate.clear(repo)
             unshelvecleanup(ui, repo, state.name, opts)
         _restoreactivebookmark(repo, state.activebookmark)
         ui.status(_("unshelve of '%s' complete\n") % state.name)