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.
As in summary, this happens very often: 1. switch entire project from trunk to a branch. 2. modify a couple of classes on the branch; commit to branch. 3. switch entire project back to trunk. 4. try "merge from branch...." on trunk. At this time the IDE just completely freezes up. Have to kill the IDE application and restart. Once restarted, though, the IDE seems to give the correct merging result, which should have happened before the freeze up.
Created attachment 37307 [details] thread dump
Reproduce on FC 3, jdk1.6.0 (build 104) for NB 5.5, but can't reproduce for NB 6.0.
It seems to be a random problem.
Created attachment 37311 [details] Unwrapped stack trace
Reassigning to javacore for evaluation.
Will be fixed in 6.0.
I am confused about the status. The comment says "will be fix in 6.0", but resolution says "won't fix"?
Reorganization of java component