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 91108 - Applying arbitrary merge impossible from the GUI
Summary: Applying arbitrary merge impossible from the GUI
Status: RESOLVED DUPLICATE of bug 80484
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 5.x
Hardware: All All
: P3 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords: UI
Depends on:
Blocks:
 
Reported: 2006-12-15 08:32 UTC by David Strupl
Modified: 2007-01-04 17:14 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 David Strupl 2006-12-15 08:32:26 UTC 
Hello,

maybe I just did not find how to do that but it is not possible to do following
command equivalent

cvs -j1.27 -j1.31 XYZ.java

where I as the user could choose arbitrary revisions for a file. Or did I just
miss something in the GUI? If I missed it please close this report, if not I
think it is a bug.

Thanks, David

PS.: Take following as a use case: you do a rollback of some change. You want to
re-do the change later. How would you do that?
Comment 1 David Strupl 2006-12-15 08:33:59 UTC 
oops I meant

cvs up -jX -jY xxx
Comment 2 Maros Sandor 2006-12-15 11:43:17 UTC 
You can do this, but it might not be obvious from the UI. Invoke Merge Changes
From Branch from the CVS menu. There you can select a branch to merge from and
(optionally) a start tag of the merge. What this does is: update -j start_tag -j
branch_name. Please reopen if this does not work for you and describe your
usecase in more detail.
Comment 3 David Strupl 2006-12-15 12:09:41 UTC 
I will try to explain again.

1. Assume you have no branches (just the trunk).

2. Commit some change going say from 1.32 to 1.33

3. rollback the change (bringing you back to 1.34 == 1.32).

4. do some more changes, e.g. commit until 1.40.

5. try to re-do the change between 1.32 and 1.33. how do you do that? In
"normal" cvus you would have checked out HEAD (on 1.40) now and do
cvs up -j 1.32 -j1.33 ; commit

Can you do this from the GUI? 

Also sometimes you just want to rollback changes done in more commits, so you do
in command line cvs e.g.

cvs up -j1.35 -j1.30

How do you do this from the GUI?

Again NO BRANCHES, no tags what so ever. If you try to put the revision numbers
there the GUI client spits some error message to the user.

Whether this is a bug or ENH is for discussion but it is definitelly not
"WORKSFORME". IMHO it is a bug since there is some essential functionality
missing. The user has to resort to the command line client for a very basic
operation, that is a bug IMHO.
Comment 4 Maros Sandor 2006-12-15 12:23:06 UTC 
No, you cannot do this from the UI. I can imagine we can inject this
functionality into local history OR enhance the Merge dialog. Let HIE have the
final decision. This should not be a lot of work, targetting for 6.0.
Comment 5 Maros Sandor 2006-12-18 14:14:25 UTC 

*** This issue has been marked as a duplicate of 80484 ***