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 80484 - Cannot merge changes between revisions
Summary: Cannot merge changes between revisions
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 6.x
Hardware: All All
: P3 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
: 91108 (view as bug list)
Depends on:
Blocks: 89591
  Show dependency tree
 
Reported: 2006-07-18 14:25 UTC by _ rkubacki
Modified: 2007-03-06 10:02 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 _ rkubacki 2006-07-18 14:25:41 UTC 
I want to backport changes of core/launcher/windows/nbexec.cpp into release55
branch and need o perform following command

cvs up -j 1.25 -j 1.26 nbexec.cpp 

This is not possible in the as I can only use tag names and not revisions in
'merge changes from brach...' dialog.
Comment 1 Maros Sandor 2006-07-18 15:02:47 UTC 
You can use revision number in the "Merge changes after tag" input field.
however, you cannot specify the other (ending) revision number. In other words,
you can perform:

cvs up -j 1.25 -j HEAD nbexec.cpp 

We may consider adding another field for the second parameter.
Comment 2 Maros Sandor 2006-12-18 14:14:24 UTC 
*** Issue 91108 has been marked as a duplicate of this issue. ***
Comment 3 Maros Sandor 2007-03-06 10:02:26 UTC 
Merge dialog now supports defining both -j arguments.

/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergeBranchPanel.java,v
 <--  MergeBranchPanel.java
new revision: delete; previous revision: 1.16
/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergePanel.java,v
 <--  MergePanel.java
initial revision: 1.1
/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergeBranchAction.java,v
 <--  MergeBranchAction.java
new revision: 1.21; previous revision: 1.20
/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/Bundle.properties,v
 <--  Bundle.properties
new revision: 1.34; previous revision: 1.33
/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergePanel.form,v
 <--  MergePanel.form
initial revision: 1.1
/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergeBranchPanel.form,v
 <--  MergeBranchPanel.form
new revision: delete; previous revision: 1.5
/shared/data/ccvs/repository/javacvs/www/cvsmodule/develop/branches.html,v  <--
 branches.html
new revision: 1.9; previous revision: 1.8