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.

Bug 102270 - Resolving CVS conflict results in NB freezing up
Summary: Resolving CVS conflict results in NB freezing up
Status: RESOLVED DUPLICATE of bug 99102
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 6.x
Hardware: PC Windows XP
: P2 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-04-24 06:35 UTC by frankioski
Modified: 2007-04-24 12:33 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Attaching thread dump taken when NB 6 Dev froze during resolving CVS conflict. (14.44 KB, text/plain)
2007-04-24 06:37 UTC, frankioski 		Details
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description frankioski 2007-04-24 06:35:28 UTC 
I updated a local file (CVS) and NB notified me of conflict.  I proceeded to
resolve conflict by removing old code from the local version using the Resolve
Conflict editor screen and clicking on the "X"s in the center bar, next to the
line numbers.  NB froze when after I've clicked on a few Xs.

Attaching thread dump.
Comment 1 frankioski 2007-04-24 06:37:07 UTC 
Created attachment 41520 [details]
Attaching thread dump taken when NB 6 Dev froze during resolving CVS conflict.
Comment 2 frankioski 2007-04-24 06:43:37 UTC 
NB 6 Dev build was 200703280911.
Comment 3 ehucka 2007-04-24 09:16:43 UTC 
reassigned to cvs module
Comment 4 Maros Sandor 2007-04-24 12:33:19 UTC 
Please verify in M9.

*** This issue has been marked as a duplicate of 99102 ***