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 9347 - Files with [Conflict] status cause throwing ParseExceptions into the console.
Summary: Files with [Conflict] status cause throwing ParseExceptions into the console.
Status: CLOSED DUPLICATE of bug 9320
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 3.x
Hardware: Other Other
: P4 minor (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2001-02-01 18:15 UTC by Jiri Kovalsky
Modified: 2007-01-04 17:14 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Attachment for bug #9347. (929 bytes, text/plain)
2001-07-20 20:47 UTC, Jiri Kovalsky 		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 Jiri Kovalsky 2001-02-01 18:15:58 UTC 
Development build of NetBeans #116 (2001-02-01) on Windows 2000 with JDK 1.3.

Description:
============
Under specific circumstances commands like "Checkout" or "Update" cause throwing
exceptions due to unparsable source code after appropriate file comes to
conflict after merge of two revisions. This is simply reproducable. For details
have a look at the file attached.

Steps to reproduce:
===================
1. Mount JavaCVS filesystem and underneath create brand new java bean file from
   template using "New|Beans|Bean" menuitem, "Add" and "Commit" it.
2. "Open" it, change the name of property at line 20 to "renamedProperty","Save"
   the file and "Commit" it to create revision 1.2 in the repository.
3. Now "Open" the file once again, change the property to "anotherProperty" and
   "Save" the file to change its status to [LMod].
4. Finaly invoke "Update" action on the file, setup "Revision/Tag" to 1.1 and
   run command. There should be mentioned exception thrown into the console.
Comment 1 Jiri Kovalsky 2001-02-01 18:17:59 UTC 
Created attachment 538 [details]
Attachment for bug #9347.
Comment 2 _ rgreig 2001-02-19 23:21:21 UTC 
This bug is essentially the same problem as #9320 - the setConflict() method of 
class Entry isn't handling non-date conflict fields properly.

*** This issue has been marked as a duplicate of 9320 ***
Comment 3 Quality Engineering 2003-07-01 12:48:26 UTC 
Resolved for 3.4.x or earlier, no new info since then -> closing.