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 73835 - Problems while conflicts occur.
Summary: Problems while conflicts occur.
Status: VERIFIED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Subversion (show other bugs)
Version: 6.x
Hardware: All Windows XP
: P1 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-03-21 17:13 UTC by Peter Pis
Modified: 2006-10-23 16:41 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
exception (1.86 KB, text/plain)
2006-03-21 17:14 UTC, Peter Pis 		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 Peter Pis 2006-03-21 17:13:44 UTC 
Product Version         = NetBeans IDE Dev (Build 060320)
Operating System        = Windows XP version 5.1 running on x86
Java; VM; Vendor; Home  = 1.5.0_06; Java HotSpot(TM) Client VM 1.5.0_06-b05;

Steps:
1. Open versioned controlle project.
2. Create new copy for the project and switch to it.
3. Modify files and commit.
4. Switch to copy of project used in step 1.
5. Modify the same files (in step 3.) but with differences (to create conflicts)
6. Merge current working copy with the copy created in step 2.

Even though only three "small" files were in conlicts, IDE became too slow. All
"tmp" files were shown into the explorers and shown as locally new. IMHO, these
"tmp" files should be ignored. A lot of exception were thrown.
Comment 1 Peter Pis 2006-03-21 17:14:10 UTC 
Created attachment 29334 [details]
exception
Comment 2 _ pkuzel 2006-04-10 09:41:05 UTC 
I can reproduce
Comment 3 _ pkuzel 2006-04-10 10:19:27 UTC 
Checking in FileStatusCache.java;
/shared/data/ccvs/repository/subversion/main/src/org/netbeans/modules/subversion/FileStatusCache.java,v
 <--  FileStatusCache.java
new revision: 1.31; previous revision: 1.30
done
Comment 4 Peter Pis 2006-04-14 09:52:47 UTC 
Verified.