| Date Of Receipt: 31-OCT-1996 15:28:38.66
From: FLUME::jmf "Joshua M. Friedman Digital UNIX 31-Oct-1996 1525"
To: grava@DEC:.zko.flume
CC: odehelp@DEC:.zko.flume
Subj: re: ptbos.bl3->steelos merge problem
Bill, can you check for the presence of these two files in your sandbox:
.BCSconfig .BCSset-William_Grava_<set>
and within each there should be a line listing the file
./kernel/arch/alpha/hal/ruby_common.c
If not, something in the bmerge didn't complete, and we can "manually"
create these file entries. There may also be a bug report to file here.
Thanks... -josh
------- Forwarded Message
Date: Thu, 31 Oct 1996 08:20:00 -0500
From: Bill Grava <[email protected]>
Reply-To: [email protected]
Organization: Unix Hardware Support
X-Mailer: Mozilla 3.01b1 (Win95; I)
Mime-Version: 1.0
To: [email protected]
Cc: grava
Subject: ptbos.bl3->steelos merge problem
ARGGHHH!
./kernel/arch/alpha/hal/ruby_common.c won't merge for me. This is
what I did:
workon -sb steelos_merge
cd kernel/arch/alpha/hal
bmerge -km -jPTAOS_BL4:PTBOS_BL3 ruby_common.c
The bmerge took me directly into [edit], followed by [rdiff]
and [diff], appeared to successfully do its thing (and leave a merged
ruby_common.c file in my sandbox), but it doesn't appear to get picked
up by the process. bstat and bdiff can't find anything, so there's
nothing
to check in. Originally, ruby_common was among the five files I tried
to
merge Tuesday -- but only the first four (kn22a.c, kn20aa.c, et al.)
were
included in the srequest.
> fill_dlist(struct elr_dec7000_dlist *dlist_ptr)
1149c1244,1245
< int ruby_calc_lsb_size()
- ---
> int
> ruby_calc_lsb_size(void)
diff -r1.1.40.3 OdeSrvrTmpWilliam_Grava008709/ruby_common.c
Choose next merge action on ./kernel/arch/alpha/hal/ruby_common.c
Abort, ok, edit, novisual, [r]co, help [ok]
*** Done with merging './kernel/arch/alpha/hal/ruby_common.c' ***
[grava@fatmax hal]$ bstat -all
[grava@fatmax hal]$ ls
ruby_common.c
[grava@fatmax hal]$ bdiff -all
[grava@fatmax hal]$
What did or didn't I do?
thanks.
- --
- -bill (http://www.zk3.dec.com/~grava)
We are Microsoft. You will be assimilated. Resistance is futile.
------- End of Forwarded Message
|