7718 Unshelve Changes problem

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?

4 comments
Comment actions Permalink

OK - I found a backup of those files, so the problem isn't urgent - just puzzling and a bit concerning...

0
Comment actions Permalink

Dave Lorde wrote:

OK - I found a backup of those files, so the problem isn't urgent -
just puzzling and a bit concerning...


I agree... I have yet to rely on shelving because I'm too nervous it
won't work... and these bug reports don't instil confidence... but then
how do we help get the feature up to production quality if we don't all
use it and report the bugs we find? Vicious circle...

N.

0
Comment actions Permalink

I've used it before successfully, so I'm happy to use it with a backup for safety - I just couldn't remember taking one at the time...

0
Comment actions Permalink

Nathan Brown wrote:

Dave Lorde wrote:

>> OK - I found a backup of those files, so the problem isn't urgent -
>> just puzzling and a bit concerning...


I agree... I have yet to rely on shelving because I'm too nervous it
won't work... and these bug reports don't instil confidence... but then
how do we help get the feature up to production quality if we don't all
use it and report the bugs we find? Vicious circle...

N.

OK, I got brave and used shelving properly for the first time today...
couple of issues came up... firstly the unshelved changes went into the
default changelist instead of the one I selected - looks like
http://www.jetbrains.net/jira/browse/IDEADEV-14142 should be back open
again. I've added a comment there.

Also, whilst my changes were shelved I regened some JAXB classes, and
these classes were also regened as part of the shelved work. When I
tried to unshelve, all these regened classes failed with :

Failed to apply patch for file xyz.java: Context mismatch. Expected line:
//
Found line:
// Generated on: 2008.03.07 at 04:35:44 GMT

Most of the regened classes wouldn't actually be much different, apart
from some date changes maybe. So why is patching them failing - is this
expected? I'd put this in a JIRA but there are so many existing ones
for shelving in there it's bewildering and so I can't tell if this is a
known problem.

N.

0

Please sign in to leave a comment.