This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Using : NB 7.1, Win7,Maven projects & subversion. Shelve changes works but I can't unshelve changes. Whatever I select , I'm allways getting the message 'The patch cannot be applied in the selected context.'. I tried selecting the project, the source folder, the package and the class. Nothing helped. By the way, is shelve changes hidden on purpose ? I expected it in a context menu. Thanks, Bart
If the unshelve changes fails, look into the Output tab called Patch Report and paste the content of the window here.
Here's the output : applying patch: C:\Users\vandercammen.b\.netbeans\7.1\config\Versioning\patch-storage\unfinishedChanges.patch --- Successfully Patched --- <none> --- Failed --- C:\Applic\Development\projects\finatmed-mvn\finatmed-main\finatmed-common\src\main\java\be\mil\cccis\util\message\Content.java (Cannot apply hunk @@ 7 ) 3-feb-2012 8:33:05 =========================================================================== applying patch: C:\Users\vandercammen.b\.netbeans\7.1\config\Versioning\patch-storage\unfinishedChanges.patch --- Successfully Patched --- <none> --- Failed --- C:\Applic\Development\projects\finatmed-mvn\finatmed-main\finatmed-common\src\main\java\be\mil\cccis\util\message\Content.java (Cannot apply hunk @@ 7 )
> C:\Applic\Development\projects\finatmed-mvn\finatmed-main\finatmed-common\src\main\java\be\mil\cccis\util\message\Content.java > (Cannot apply hunk @@ 7 ) You must have made some changes to the file between shelving and unshelving. Shelve and unshelve works basically as a simple pair of export diff and apply diff. If you make some changes to a file that prevent application of the patch the unshelve action simply fails. I don't think we can do much about it. It's then up to you to apply the patch manually or modify the file to the state before right after shelving. There could be a way to improve the shelve/unshelve action for subversion. Then would require: 1) Remember the revision number of the shelved files right after the shelve is done. 2) Before the unshelve action update the files to the remembered revision 3) Unshelve changes - apply the patch 4) Update again to the previous revision However this heavyweight implementation was not the original intent and requires a lot of additional work.
OK, it works when I don't change the file. I assumed it would merge automagically. I suppose that when something changed I should revert first to the version I had before shelving. Thanks for the replies, Bart
You do not need to revert, update should do. See the steps described in Comment #3. If you follow them then 4) will merge the changes.
OK, sorry. That works too. Thanks, Bart