Cannot Unshelve Changes - Any workarounds

Hi Folks. I hit a problem where I cannot un-shelve some major work. There is already a bug on this in the system (IDEA-16672) opened in December by someone else. My situation is exactly as described in that bug, down to the screenshot (though my files are on the "f:" drive instead of the "z:" drive).

In any case, Intellij is complaining it can't find the file to "patch", which I presume is what it does when you un-shelve something. The log shows this:

2008-02-20 11:46:48,542 INFO - cs.changes.shelf.ShelvedChange -
java.io.IOException: The filename, directory name, or volume label syntax is incorrect

I'm guessing it has something to do with the fact that the source files are on a different drive than the project and/or intellij drive and is not being handled properly.

Any ideas for a workaround? I sent a request to support, but I need to get these out of the shelf quickly. I assume they are in the shelf or a different error would be appearing.

Thanks

4 comments
Comment actions Permalink

If it matters:

OS: Windows XP
JDK: JDK 1.6.0
IDEA: 7.0
Build: 7509

0
Comment actions Permalink

Well, most of the important files in the shelf are new. And I can see their contents by using "Show Diff". For the changes to existing files, I will try using local history.

Shelving was the major reason I switched to #7. Very disappointed that I cannot use it with its current implementation...

0
Comment actions Permalink

Here's the error if I manually attempt to patch something in the shelf. So, I would say its an issue with the source being in a different folder than the project... (project is on C:\, source is on F:\)

Error creating patch: Failed to fetch old content for changed file C:\Trunk\F:\trunk\insight\conf\shredderConfig.xml

Oh well, at least I figured out a workaround for now. Hope they fix this.

0
Comment actions Permalink

Also note that Idea creates files in "standard" patch format in its config/shelf folder.
IIRC you can find that underneath .IntelliJ70 in your home directory (e.g. on Windows right click on "Start" button and choose explorer).
You could try to apply those patches with another tool or manually review the contents in a text editor.

Craig Petty wrote:

Here's the error if I manually attempt to patch something in the shelf. So, I would say its an issue with the source being in a different folder than the project... (project is on C:\, source is on F:\)

Error creating patch: Failed to fetch old content for changed file C:\Trunk\F:\trunk\insight\conf\shredderConfig.xml

Oh well, at least I figured out a workaround for now. Hope they fix this.

0

Please sign in to leave a comment.