Why not create a branch: BP_Obsolete, merge main to BP_Obsolete.
THEN merge BP to main.
Bob Baas
AT&T Cincinnati
-----Original Message-----
From: Evelyn C. Leeper [mailto:eleeper@lucent.com
Sent: Monday, September 25, 2000 1:45 PM
To: cciug@rational.com
Subject: [cciug] Copy Merge?
Here's the situation (simplified):
We have a VOB which has elements with main and SIDE branches. People have
been working on the SIDE branch, which branched off from main at some label
(call it BP). People also did work on the main
branch.
Now they've decided they want to abandon the work on the main branch and
merge the SIDE branch back into main by (in effect) just copying the
SIDE/LATEST to main. But for some reason they don't want
to delete any of the existing versions on main.
The best I could come up with was to do a subtractive merge on main,
deleting everything between the version following BP and LATEST, inclusive,
then doing an ordinary merge from SIDE onto main. This
is still pretty ugly, though. Is there a better/simpler way? (Given that
hundreds, if not thousands, of elements are involved, it must be
scriptable--not in the GUI!)
What would be ideal is an option to merge that says to ignore the
destination branch contents and just copy the source onto the destination
branch. However, I can't seem to find that. We are
running version 3.1 on UNIX.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
This archive was generated by hypermail 2b29 : Sun May 06 2001 - 00:26:50 EDT