| Date Of Receipt: 9-JUN-1995 12:07:26.10
From: SMURF::WASTED::jmf "Joshua M. Friedman OSF/UNIX SDE"
To: tmark@DEC:.zko.wasted
CC: odehelp@DEC:.zko.wasted
Subj: Re: Need help with bmerge
Tim,
If you haven't done your submit & outdated in ptos, here's what you can do:
while backed to ptos or ptos.nightly
bco file
edits/testing
bci file
bsubmit file --- but don't outdate
resb ptliteos or ptliteos.nightly
bsubmit file --- now outdate
If you already have outdated the file, then here what to do:
find the ptos rev you create and then the one before your submit,
you can look in the file header if it's a file with a header;
for example say the ptos rev was 1.1.6.12 and after your submit
it became 1.1.6.13; do this:
while backed to ptliteos
bco -j1.1.6.12:1.1.6.13 file
if there are any merge conflicts they'll be marked in the file
with the <<<<< ====== >>>>>> delimiters
check the file out to make sure it's ok, eg:
bdiff file
bci file
bsubmit file
that's all there is to it!
-josh
-----------
To: odehelp
Cc: tmark
Subject: Need help with bmerge
Date: Fri, 09 Jun 95 09:11:50 -0400
From: tmark
Hi,
I have checked in a QAR fix into a sandbox I have backed against ptos.nightly.
Now I need to put that fix into ptliteos.nightly. Is there a clever way
I can use "resb" and "bmerge" to apply only those changes I made to the
ptlite version? Note that the ptlite and ptos versions of these modules
already differed before I began my work and I only want to put my changes
into ptlite, not all of the differences between the two baselines. Thanks
very much in advance.
Tim
|