hg unshelve: abort: working directory parents do not match unshelve state

Question

I recently tried unshelving a change on Mercurial, and an unshelving rebase conflict occurred, which I ended up resolving. Something went wrong after that, because now when I try to do anything else, I get the following error:

abort: unshelve already in progress
(use 'hg unshelve --continue' or 'hg unshelve --abort')

And when I try to use either of those two options, I get the following:

abort: working directory parents do not match unshelve state

How can I restore my working directory to a usable state?

Answer 1

I deleted .hg/shelvedstate and that fixed it for me. You can also move that file instead i.e. mv .hg/shelvedstate .hg/backupshelvedstate if you want to keep the shelvedstate.