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 27322

Summary: File Statuses missing: "Entry Invalid" and "Unresolved Conflict"
Product: versioncontrol Reporter: Gus <gustavoc>
Component: CVS libraryAssignee: Martin Entlicher <mentlicher>
Severity: blocker Keywords: SIMPLEFIX
Priority: P3    
Version: 3.x   
Hardware: PC   
OS: Windows ME/2000   
Issue Type: DEFECT Exception Reporter:
Attachments: CVS status.htm

Description Gus 2002-09-13 20:20:11 UTC
In these cases the api returns null.

The first one is obtained when a file is removed and I 
didn't update my local file (so it's invalid).

The second one is almost the same, someone removed a file 
from repository but I did some changes over it so it has 
unresolved conflicts.
Comment 1 Gus 2002-09-13 21:18:09 UTC
In addition, the method getStatusString() from 
StatusInformation also returns null when these statuses 
are produced.
Comment 2 Martin Entlicher 2003-02-20 11:47:16 UTC
Setting future as a Target Milestone.
Probably a new FileStatus constant needs to be created in these cases.
But perhaps "Unresolved Conflict" and "File had conflicts on merge"
can be represented by a single FileStatus?
Comment 3 Jiri Kovalsky 2003-02-20 12:19:05 UTC
I'm fine with it. What about you Gus ?
Comment 4 Gus 2003-02-20 13:32:36 UTC
Well, to be honest, the status "Entry invalid" (wich is 
not "File had conflicts on merge") is quite different 
from "Unresolved conflict". There are several cases for 
each one, and there are different procedures to resolve 
each of this conflicts.

It will be fine to have any answer instead of null, but an 
apropriate answer will be better.

Comment 5 Gus 2003-02-20 13:44:33 UTC
Created attachment 9059 [details]
CVS status.htm
Comment 6 Gus 2003-02-20 13:45:17 UTC
This is an exhaustive analisys I made of CVS statuses. I 
think it would be of help. Don't hessitate to ask if you 
have any doubt about it.
Comment 7 Martin Entlicher 2003-06-19 16:18:50 UTC
The table is nice.
Changing subcomponent to library and scheduling for 4.0. This is easy
to implement.
Comment 8 Gus 2003-06-19 17:11:33 UTC
And given that you mentioned the table I would like to add 
that the thing of being exhaustive doesn't mean it is 
error free. But, anyway, it helped me to understand the 
different statuses and I thought it could be usefull for 
you too.

Good luck with the implementation! We'll be waiting 4.0 
anxiously! :)
Comment 9 Martin Entlicher 2003-07-25 11:47:16 UTC
Starting to work on this.
I've put the attached table to web:
Comment 10 Martin Entlicher 2003-07-25 12:13:27 UTC
Fixed in the main trunk:

new revision: 1.8; previous revision: 1.7
Comment 11 Jiri Kovalsky 2003-10-08 13:08:55 UTC
Could you please Gus verify the fix ? Are you satisfied with it ?
Thanks  a lot !
Comment 12 Gus 2003-10-08 15:19:32 UTC
I'm using the stable version that's why I haven't verified it.
Comment 13 Jiri Kovalsky 2003-10-08 16:17:15 UTC
Does it mean you won't ever verify it ? Which stable version do you
mean  ? 3.5 ?
Comment 14 Gus 2003-10-08 17:16:54 UTC
No man. I'm using 3.5.1 sources and we've modified this file 
temporarily to continue working with the lib 'til 4.0 is ready (if 
you think this will never appear, well, let me know).
Comment 15 Jiri Kovalsky 2003-10-14 15:45:45 UTC
Okay, in such case I am verifying this issue looking directly into the
sources. Thanks Gus.
Comment 16 Gus 2003-10-14 16:41:34 UTC
I'm sorry I couldn't help you.