I shelved a change list containing 8 java source files a few days ago, then made some changes to the project for an intermediate release.
Today, I unshelved the changes, expecting to have to resolve conflicts in two of the files. The unshelve process displayed an error message box saying something along the lines that there was a problem because a method wasn't throwing an exception - I assumed this was a warning about a conflict.
When I OK'd the message box, the shelf was still there, still containing all 8 source files. Comparing the project code with the respository, I can see that 6 files have been unshelved correctly. The two files I expected to need merging have not been unshelved, and when I try to diff the shelved versions, the diff window shows the base version on the left, all grey, and nothing on the right.
I need to recover the shelved versions of these two files, but I can't see how to do this. Is there a cache, history, or backup somewhere in IDEA where I can find these shelved files?