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 171974

Summary: [68cat] Svn tries to 'add' also replaced files
Product: versioncontrol Reporter: ulfzibis <ulfzibis>
Component: SubversionAssignee: issues@versioncontrol <issues>
Status: RESOLVED FIXED    
Severity: blocker    
Priority: P3    
Version: 6.x   
Hardware: PC   
OS: Windows XP   
Issue Type: DEFECT Exception Reporter:
Attachments: Commit failed because of inconsistency
folder sun\nio\cs

Description ulfzibis 2009-09-10 20:05:56 UTC
[ BUILD # : 200909081533 ]
[ JDK VERSION : 1.6.* ]

NB says:          new
TortoiseSVN says: modified
Comment 1 ulfzibis 2009-09-10 20:06:55 UTC
Created attachment 87464 [details]
Commit failed because of inconsistency
Comment 2 Ondrej Vrabec 2009-09-10 20:27:41 UTC
Is this reproducible? Does it stay 'New' even after Subversion->Show changes?
Comment 3 ulfzibis 2009-09-10 20:58:07 UTC
Yes, several times.

Additionally I tried cleanup and update under TSVN, nothing helped.
Comment 4 Ondrej Vrabec 2009-09-10 21:12:46 UTC
> Additionally I tried cleanup and update under TSVN, nothing helped.
I meant if it helps to run Subversion > Show changes - in Netbeans. It is possible that by using also TSVN the cache of
statuses in Netbeans gets obsolete and you have to refresh it with Subversion > Show changes.

But if not even Show changes helps, than it's probably some problem in status parsing. Could you send me the whole
sun/nio/cs folder (with java files and .svn folder)? I would try to determine what's wrong.
Comment 5 ulfzibis 2009-09-10 22:17:38 UTC
> I meant if it helps to run Subversion > Show changes - in Netbeans. It is possible that by using also TSVN the cache
> of statuses in Netbeans gets obsolete and you have to refresh it with Subversion > Show changes.
I did understand this. ;-)
This I meant by "Yes".
Comment 6 ulfzibis 2009-09-10 22:21:45 UTC
Created attachment 87468 [details]
folder sun\nio\cs
Comment 7 Ondrej Vrabec 2009-09-24 16:50:14 UTC
fix: cdev #5c90150d0724

status of MS1252.java is 'replaced'. We tried to 'svn add' such file during commit which was a mistake. Now the file is
committed directly without being added.
Comment 8 Quality Engineering 2009-09-27 22:37:06 UTC
Integrated into 'main-golden', will be available in build *200909270201* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main-golden/rev/5c90150d0724
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #171974 - [68cat] Svn tries to 'add' also replaced files
Replaced files are considered locally added not locally new