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.
|Summary:||incorrect status of the project after a resolved conflict|
|Issue Type:||DEFECT||Exception Reporter:|
Description matusdekanek 2009-05-18 14:20:19 UTC
Product Version: NetBeans IDE Dev (Build 200905130201) Java: 1.6.0_14-ea; Java HotSpot(TM) Client VM 14.0-b12 System: Linux version 2.6.28-11-generic running on i386; UTF-8; en_US (nb) Create a project import it into a cvs repository checkout the project somewhere else (so that you have two working copies), open both projects in the IDE do some changes in a file in one working copy do some changes in the same fiel on the same line in the second working copy commit the changes in first working copy invoke 'update with dependencies' on the second working copy - a warning that conflict was made appers resolve conflict commit the changes in the second working copy The state of the second working copy is still 'modified' (it has the blue mark indicating local uncommited changes), even though the project is commited. Invoking 'cvs/show changes' on the second working copy refreshes the state of the project.