Comment 8 for bug 389674

Revision history for this message
Russ Brown (pickscrape) wrote :

Following on from an IRC discussion with John, my most recent case was as a result of attempting to unshelve to a different branch (in a lightweight checkout) to the branch that the shelve was originally performed on.

John mentioned that there is a "required revision ID" that the shelf will reference, and it may be that it not be finding it. In my case, both branches involved are in the same shared repository, so the revision should be available regardless of the branch that is currently checked out. So it may be that it is only looking at revisions in the branch ancestry.

Another way of looking at it is that what I was basically trying to do was perform a merge --uncommitted from the original branch (with the shelved content as uncommitted changes) to the second branch. I'm not sure if that implies that unshelve may need to potentially use another code path or not in some cases.