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 7131 - In VCSCVS current branch is offered if you want to run "Merge With Branch" command.
Summary: In VCSCVS current branch is offered if you want to run "Merge With Branch" co...
Status: CLOSED INVALID
Alias: None
Product: obsolete
Classification: Unclassified
Component: vcscvs (show other bugs)
Version: 3.x
Hardware: PC All
: P4 enhancement (vote)
Assignee: issues@obsolete
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2000-07-21 11:22 UTC by Jiri Kovalsky
Modified: 2003-07-02 17:18 UTC (History)
1 user (show)

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 Jiri Kovalsky 2000-07-21 11:22:23 UTC 
Tested on: IE/CE Build 1063, Windows 2000, Windows NT
==========
Description:
============
If somebody wants to merge current branch in VCSCVS with some other, in
following dialog CVS offers you current branch as well.

Steps to reproduce:
==================
1. Mount new VCSCVS and add some new file to the repository.
2. On this file create new branch: "CVS/Add Tag" menu item
3. Choose "Branch Tag", "On Revision" select "1.1" and "Tag Name" set
to "Second_branch" and click OK.
4. On this file checkout this new branch: "CVS/Check Out Revision" menu item
and select "1.1.0.2 Second_branch" revision and click OK.
5. Try to run merge with branch command: "CVS/Merge With Branch" menu item.
6. In next dialog "1.1.2 Second_branch" will be offered.
Comment 1 Martin Entlicher 2000-08-03 13:19:59 UTC 
The use of this command described is wrong. The "Merge With Branch" command
works for merging branch content into the main trunk. Therefore you have to have
checked out the main trunk, then do the "Merge With Branch" command, where you
choose the desired branch, and after resolving possible conflicts do commit.
Comment 2 dmladek 2000-08-07 10:04:59 UTC 
I don't agree(in general). Please have a look again the short description. I
think that it is correct  procedure to be in some branch (which is not root=main
trunk) and wants to marge with another branch (which is not also main trunk).And
in this situation it shouldn't be offered to you merge with tha same branch in
you are...So, if you will have little time, please dismiss your own branch from
the offer...
Thanks
Comment 3 Jiri Kovalsky 2000-12-08 16:33:59 UTC 
BUG also appears in version : FFJ20 (both CE/IE)
Comment 4 Martin Entlicher 2001-04-17 11:11:51 UTC 
You should be able to choose the current branch/revision if you want to merge
with a difference between two revisions. (i.e. between the current branch and
HEAD).
Comment 5 Martin Entlicher 2001-04-17 11:12:59 UTC 
This bug probably applies only to 3.1.
Comment 6 dmladek 2001-05-28 17:45:03 UTC 
verified as invalid [NBdev-196]
Because of feature merge the current with HEAD, this is bug is realy invalid
Comment 7 Quality Engineering 2003-07-02 17:18:55 UTC 
Resolved for 3.4.x or earlier, no new info since then -> closing.