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: | Cannot merge changes between revisions | ||
---|---|---|---|
Product: | versioncontrol | Reporter: | _ rkubacki <rkubacki> |
Component: | CVS | Assignee: | issues@versioncontrol <issues> |
Status: | RESOLVED FIXED | ||
Severity: | blocker | ||
Priority: | P3 | ||
Version: | 6.x | ||
Hardware: | All | ||
OS: | All | ||
Issue Type: | ENHANCEMENT | Exception Reporter: | |
Bug Depends on: | |||
Bug Blocks: | 89591 |
Description
_ rkubacki
2006-07-18 14:25:41 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. *** Issue 91108 has been marked as a duplicate of this issue. *** 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 |