Conference smurf::buildhelp

1837.0. "Re: oddities in ODE (to merge or not to merge)" by AOSG::FILTER (Automatic Posting Software - mail to flume::puck) Tue Sep 26 1995 22:32

Date Of Receipt: 	26-SEP-1995 01:06:10.00
From: 	SMURF::WASTED::jmf "Joshua M. Friedman OSF/UNIX SDE"
To: 	lae@DEC:.zko.wasted
CC: 	ddhill odehelp
Subj: 	Re:  oddities in ODE (to merge or not to merge)

Laurie, if you were backed to decx11 when you did your original
bco, and this bco created a new branch for you (as opposed to 
continuing work with on a previously not-outdated branch), and
noone submitted to decx11 between your bco and bsubmit, then you
should not have to merge.  

Check this out:
    bstat -R -V -r"DECX11;XEXTERNAL" <file>
will show you src path and the most recent revision for this file in decx11.

Compare this to the line for <file> in your <sandbox>/src/.BCSconfig file.

This file shows the version from decx11 (or xexternal) which was your
starting point.  As long as bstat and .BCSconfig agree exactly, no
merge is needed.  If they don't agree, it appears to ode that work was
done since your original bco; this original rev is shown in .BCSconfig;
you may be able to compare that to the list below to see what that
starting point was.

Hope that helps...			-josh

------
To: jmf@quarry.zk3.dec.com
Subject: oddities in ODE
Date: Mon, 25 Sep 95 16:10:37 -0400
From: lae@quarry.zk3.dec.com

Josh,
Why do I need to merge when I'm backed by decx11 when it
doesn't seem like I should have to do this?

PS - Dave Hill made me ask this question ;)


/tmp_mnt/home/lae/sandboxes/decx11/src/xc/lib/X11
workon_decx11> blog lcCT.c

[ ./xc/lib/X11/lcCT.c ]

RCS file: ./xc/lib/X11/lcCT.c,v
Working file: lcCT.c
head: 1.1
branch: 1.1
locks: strict
access list:
symbolic names:
        Laurie_Edlund_decx11: 1.1.6
        PTX11_BL8: 1.1.5.2
        PTX11_PRE_BL8: 1.1.5.2
        PTX11: 1.1.5
        DECX11_PRE_BL8: 1.1.3.4
        PTX11_BL7: 1.1.3.3
        DECX11_BL7: 1.1.3.3
        PTX11_PRE_BL7: 1.1.3.3
        DECX11_PRE_BL7: 1.1.3.3
        PTX11_BL6: 1.1.3.2
        PTX11_PRE_BL6: 1.1.3.2
        DECX11_BL6: 1.1.3.2
        DECX11_PRE_BL6: 1.1.3.2
        PTX11_BL5: 1.1.3.2
        DECX11_BL5: 1.1.3.2
        DECX11: 1.1.3
        PTX11_PRE_BL5: 1.1.1.4
        PTX11_BL4: 1.1.1.4
        DECX11_2WK: 1.1.1.4
        PTX11_PRE_BL4: 1.1.1.4
        PTDX_BL3: 1.1.1.4
        PTX_BL3: 1.1.1.4
        PTX_PRE_BL3: 1.1.1.4
        PTX11_KITBLD: 1.1.5.2
        x11r6_p4: 1.1.1.4
        XEXTERNAL: 1.1.1
        x11r6_v1: 1.1.1.3
        x11r6_beta: 1.1.1.2
        x11r6: 1.1.1.1
        X11R6: 1.1.1
comment leader: " * "
keyword substitution: kv
total revisions: 15;    selected revisions: 1
description:
----------------------------
revision 1.1.6.2
date: 1995/09/21 19:06:22;  author: Laurie_Edlund;  state: Exp;  lines: +2 -2
        QAR Number  37199