Conference smurf::buildhelp

1033.0. "merging submits from one stream into another" by SMURF::FILTER (Automatic Posting Software - mail to flume::puck) Wed Oct 26 1994 19:26

Date Of Receipt: 	26-OCT-1994 19:03:29.60
From: 	FLAMBE::jmf "Joshua M. Friedman OSF/UNIX SDE  26-Oct-1994 1900"
To: 	arvidson@DEC:.zko.flambe
CC: 	metsch@DEC:.zko.flambe, jmf@DEC:.zko.flambe, odehelp@DEC:.zko.flambe
Subj: 	merging submits from one stream into another

Bill, I got your message asking about merging submits from an active
stream into a support stream.  As I understand it, you'd like to do
something like the following; the releases and revs I've used are just
examples...

	current file with problem in: v30supportos

	deltas were submitted to fix the problem in: goldminos BL2

	Want to take deltas from goldminos BL1 to BL2 into this file;
	you may need to take even smaller delta if multiple fixes were
	done in BL2.

First look at the history of the file along the submit branch which
contains the diffs:

	blog -rGOLDMINOS filename

This will have a header, with symbol:version values, followed by the
history of every submit in goldminos.  Analyzing the submit comments,
you can find when the submit(s) that was(were) done that you need.

It's not necessary to use baselevels, but you can; for example:  In the
header you might find, GOLDMINOS_BL1=1.1.5.2, GOLDMINOS_BL2=1.1.5.4.
In this case, there are two submits between these baselevels (.3, .4).

To pull in the diffs between two baselevels, be in a workon in your
sandbox backed by v30supportos, then do:

	bco -jGOLDMINOS_BL1:GOLDMINOS_BL2 filename

To pull in the diffs for a particular rev or revs, say 1.1.5.4, back-up
one (or more) rev, say to 1.1.5.3, and do:

	bco -j1.1.5.3:1.1.5.4 filename

If there are any overlaps from the merge, bco will flag these with
<<<<<<<, =========, >>>>>>>> dividers at the overlap points.

Exception: If the rev is a "#.#.#.2" then this was the first submit on
that branch, and it's more tricky; the ".1" version doesn't contain the
file without the submit; in that case you'd have to identify the
baselevel and release that goldminos was backed to at the time; eg. if
hw3os BL3, then you'd do:

	bco -jHW3OS_BL3:1.1.5.2 filename

In this case I'm not sure how clever ODE is at managing the diff/merge.

This is basically what you need to know, but there could be some cases
that don't exactly match the model.  Just ask for help if you need it.

-josh