Conference smurf::buildhelp

2182.0. "re: ode bco/merge question (for mp2/v32de1support)" by AOSG::FILTER (Automatic Posting Software - mail to flume::puck) Fri Mar 29 1996 20:35

Date Of Receipt: 	29-MAR-1996 17:11:33.90
From: 	SMURF::FLUME::jmf "Joshua M. Friedman OSF/UNIX SDE  29-Mar-1996 1708"
To: 	daniele@DEC:.zko.flume
CC: 	odehelp@DEC:.zko.flume, kenny@DEC:.zko.flume
Subj: 	re: ode bco/merge question (for mp2/v32de1support)

Mike, this requires knowing this history of this file; if it's
in v32de1support, then it was either a change from the mp1 pool
or the ptlite or the v32csupport pool.  Look to see which of 
these diffs represents the work you want to merge (maybe you
know the answer based on your history with the work):

	bdiff -rPTLITEOS_BL6 -rV32DE1SUPPORTOS file
or	bdiff -rV32CSUPPORTOS_NIGHTLY -rV32DE1SUPPORTOS file
or	bdiff -rMP1OS_BL2 -rV32DE1SUPPORTOS file

then, where A and B are from "bdiff -rA -rB file", do this:

	bmerge -km -jA:B file

you can also do 

	bco -km -jA:B file

The bmerge will allow you to do a visual merge and has the built-in
two-way diffs (diff/rdiff) and editor in its menu.  Both should yield the
same results; any conflicts will be marked with <<<<< ===== >>>>> in
either case.

-josh


------- Forwarded Message

To: jmf
Subject: ode bco/merge question 
Date: Fri, 29 Mar 96 15:40:58 -0500
From: Mike Daniele <daniele>
X-Mts: smtp

Hi Josh,

I have functional submits to make to mp2, and the code
is already in v32de1supportos.

Joe Kenny mentioned that when I do them, I should
use some special merge options so that a future
merge of that support pool into mp2 won't require
me to merge anything.

I assume he means using bco -j somehow...

Thanks for any light you can shed. :-)

Thanks,
Mike

------- End of Forwarded Message