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 119835 - CVS merge on multi-file nodes
Summary: CVS merge on multi-file nodes
Status: NEW
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 6.x
Hardware: All All
: P3 blocker (vote)
Assignee: issues@versioncontrol
Depends on:
Reported: 2007-10-23 20:37 UTC by Jun Qian
Modified: 2007-10-23 20:38 UTC (History)
0 users

See Also:
Exception Reporter:

CVS merge on a GUI form (150.53 KB, image/png)
2007-10-23 20:38 UTC, Jun Qian

Note You need to log in before you can comment on or make changes to this bug.
Description Jun Qian 2007-10-23 20:37:45 UTC
I have a GUI form (a .java file and a .form file shown as one node in the Project Explorer). I made some changes to both
files in one branch and wanted to merge the changes to a different branch. Since the .java file and the .form file have
different versions, there is no way for me to specify (using version number) which delta I want to merge for each
individual file. I switched to the File view and hoped that I had finer control over there with no luck. 

See attached snapshot.
Comment 1 Jun Qian 2007-10-23 20:38:25 UTC
Created attachment 51524 [details]
CVS merge on a GUI form