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 79631 - Merge partial changes between CVS branches
Summary: Merge partial changes between CVS branches
Status: NEW
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 5.x
Hardware: All All
: P2 blocker with 1 vote (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-07-03 16:12 UTC by christo
Modified: 2008-08-14 14:27 UTC (History)
0 users

See Also:
Issue Type: ENHANCEMENT
Exception Reporter:

Attachments
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 christo 2006-07-03 16:12:49 UTC 
It would be nice to be able to merge changes graphically, simmilar to the 
resolve conflicts gui, between different CVS branches. It happens that I only 
want to merge a few small features or fixes I've made in my development branch 
with the head branch and leave some features as is.
Comment 1 twolf2919 2008-08-14 14:27:31 UTC 
Similar scenario here: we have a branch to which some changes were made that shouldn't go in the trunk.  It would be
nice to have a "preview" from which to choose the changes to be merged.