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 59814 - merge conflict in project.xml is fatal
Summary: merge conflict in project.xml is fatal
Status: RESOLVED DUPLICATE of bug 59807
Alias: None
Product: obsolete
Classification: Unclassified
Component: vcscore (show other bugs)
Version: 5.x
Hardware: Sun All
: P1 blocker (vote)
Assignee: issues@obsolete
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-06-09 22:28 UTC by Vince Kraemer
Modified: 2005-09-05 10:14 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
the stack trace (21.27 KB, text/plain)
2005-06-09 22:29 UTC, Vince Kraemer 		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 Vince Kraemer 2005-06-09 22:28:18 UTC 
I filed 59807, but I guess the evaluator thinks it is your fault.  You may want
to read through the description, in that issue for more descriptive info....
Comment 1 Vince Kraemer 2005-06-09 22:29:29 UTC 
Created attachment 22599 [details]
the stack trace
Comment 2 Vince Kraemer 2005-06-09 22:31:03 UTC 
One thing to note here:  The stack is CONTINOUSLY generated.  So the IDE is
UNUSABLE affter the versioning window opens.
Comment 3 Martin Entlicher 2005-06-10 10:49:48 UTC 
I'm afraid that I can not do anything with that in VCS. I just use
SharabilityQuery, which is a public API with no restriction on what can it be
called on and how many times. I can not prevent from conflict marks, you will
get them as well when updating outside of the IDE.

IMO it would be best if the project system caches some results (at least the
broken state so that the exceptions are not thrown over and over again). It
looks like a dupl. of issue #47288 to me.

*** This issue has been marked as a duplicate of 47288 ***
Comment 4 Jesse Glick 2005-06-10 18:09:02 UTC 
x
Comment 5 Jesse Glick 2005-06-10 18:09:56 UTC 
Contains no new info relative to issue #59807. (I suggested reporting a bug in
vcscore if there were exceptions in VcsFileSystem, but I guess Vince misread the
stack traces - the exceptions are not in VcsFileSystem as such.)

*** This issue has been marked as a duplicate of 59807 ***
Comment 6 Vince Kraemer 2005-06-10 21:29:25 UTC 
No, I misread your comment.

I looked at the stack trace and saw that apisupport has a bug.  That bug is
pretty minor in isolation. The VcsFileSystem code triggers that bug with much
more serious repercussions for the user.  When issue 59807 [the root cause] got
closed as a dup of an enhancement request, I figured I had better send this to
the folks that were being the middleman between the root cause and the user action.

Maybe they could fix their code in a way that would prevent the "hang".

Based on the comments here, I guess we just have to hope that folks never have
merge conflicts in their project.xml files that happen to "live" in a versioned
file system.