| T.R | Title | User | Personal
Name | Date | Lines |
|---|
| 443.1 | re: ode access error, bmerge question | SMURF::FILTER | Automatic Posting Software - mail to flume::puck | Sun Nov 21 1993 12:36 | 67 |
| Date Of Receipt: 21-NOV-1993 12:34:42.88
From: WASTED::jmf "Joshua M. Friedman ULTRIX SDE 21-Nov-1993 1234"
To: bozen@wasted:zko.dec
CC: odehelp@wasted:zko.dec
Subj: re: ode access error, bmerge question
Mark, you have been added to access list.
Regarding the merge, you should use
%bmerge -r$NEW file
to prepare to submit - type "echo $NEW" to see the value of this constant,
if you like. Your syntax is slightly broken in the use of <>, which refers
to the "top of the trunk" in rcs terms. To merge up to but not beyond bl7,
use.
%bmerge -rAGOSMINOR_BL7 file (note _ not . and no <> or quotes)
bdiff -r$NEW file will show you if anyone has submitted
between when you checked out and now -- if the diffs show anyone else's header
and content changes, then do the bmerge -r$NEW. If no new submits need to
be merged, then you don't need to do bmerge.
Also note that bmerge does a bco - which means you first need to bci, and
after the bmerge and edits to clean up (if needed) you also need to again
do a bci before submitting.
-josh
------- Forwarded Message
Return-Path: bozen
Delivery-Date: Thu, 18 Nov 93 13:42:36 -0500
Return-Path: bozen
Received: from wasted.zk3.dec.com by flambe.zk3.dec.com; (5.65/1.1.8.2/01Nov93-1038AM)
id AA08500; Thu, 18 Nov 1993 13:42:33 -0500
Received: by wasted.zk3.dec.com; id AA01445; Thu, 18 Nov 1993 13:41:10 -0500
Date: Thu, 18 Nov 1993 13:41:10 -0500
From: mark bozen USG <bozen>
Message-Id: <[email protected]>
To: odehelp
Subject: ode access error, bmerge question
Status: RO
I got this error this morning:
% bsubmit mkioconf.c
Enter the defect number this submission applies to: agosminor-1965-bozen
>> FATAL ERROR in /usr/sde/ode2.0/tools/alpha_ace/bin/ode/bsubmit:
>> You are prevented from submitting to: /usr/sde/osf1/build/agosminor.
>> No entry in submit or sadmin access lists.
Also when you do a bmerge which revision do you specify, the version you are
backed to or the latest revision available? Ie. My sandbox is backed to
AGOSMINOR.BL7, which bmerge command should I use:
%bmerge -r"AGOSMINOR.BL7<>" file
or
%bmerge -r"AGOSMINOR<>" file
or
%bmerge file
Mark
------- End of Forwarded Message
|
| 443.2 | merge question | AOSG::FILTER | Automatic Posting Software - mail to flume::puck | Tue Jun 11 1996 16:34 | 22 |
| Date Of Receipt: 11-JUN-1996 13:38:32.31
From: QUARRY::patsy "Patsy Franklin USG"
To: odehelp@DEC:.zko.quarry
CC:
Subj: merge question
I did a bco
made my changes
Someone else did a bco of the same file, modified and checked in.
I was told to bci my change
bmerge that same file
bci the merged sources
Is this the right way to do this?
Would bsubmit have caused a bmerge anyways or did I need to do
the bmerge manually with the second bci?
Thanks,
Patsy
|
| 443.3 | Re: merge question | AOSG::FILTER | Automatic Posting Software - mail to flume::puck | Tue Jun 11 1996 16:35 | 32 |
| Date Of Receipt: 11-JUN-1996 13:45:38.32
From: FLUME::"[email protected]" "11-Jun-1996 1345"
To: Patsy Franklin USG <[email protected]>
CC: [email protected]
Subj: Re: merge question
| I did a bco
| made my changes
| Someone else did a bco of the same file, modified and checked in.
|
| I was told to bci my change
| bmerge that same file
| bci the merged sources
|
| Is this the right way to do this?
Yes, it's an OK way to do it.
|
| Would bsubmit have caused a bmerge anyways or did I need to do
| the bmerge manually with the second bci?
Yes, but it's a little uglier and a little messier and if you're ever gonna
get in trouble with ODE, this is one of the main ways.
--
-Grant
|
| 443.4 | Re: merge question | AOSG::FILTER | Automatic Posting Software - mail to flume::puck | Tue Jun 11 1996 16:36 | 61 |
| Date Of Receipt: 11-JUN-1996 14:01:22.99
From: FLUME::jmf "Joshua M. Friedman OSF/UNIX SDE 11-Jun-1996 1401"
To: patsy@DEC:.zko.flume
CC: odehelp@DEC:.zko.flume
Subj: Re: merge question
Patsy, the other main reason to do the merge first (and you should use
"bmerge -km -r$NEW filename" for the most streamline & correct merge),
is so that you can test.
If you let bsubmit do the merge, you have no opportunity to test. We're
even considering making bsubmit not allow a merge, requiring that people
do bmerge manually, in the hopes that more merges will get tested.
-josh
------- Forwarded Message
To: Patsy Franklin USG <[email protected]>
Cc: [email protected]
Subject: Re: merge question
In-Reply-To: Your message of "Tue, 11 Jun 96 13:38:32 EDT."
<[email protected]>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Tue, 11 Jun 96 13:45:10 -0400
From: "Grant Van Dyck" <[email protected]>
X-Mts: smtp
| I did a bco
| made my changes
| Someone else did a bco of the same file, modified and checked in.
|
| I was told to bci my change
| bmerge that same file
| bci the merged sources
|
| Is this the right way to do this?
Yes, it's an OK way to do it.
|
| Would bsubmit have caused a bmerge anyways or did I need to do
| the bmerge manually with the second bci?
Yes, but it's a little uglier and a little messier and if you're ever gonna
get in trouble with ODE, this is one of the main ways.
- --
-Grant
------- End of Forwarded Message
|