| Title: | USG buildhelp questions/answers |
| Moderator: | SMURF::FILTER |
| Created: | Mon Apr 26 1993 |
| Last Modified: | Mon Jan 20 1997 |
| Last Successful Update: | Fri Jun 06 1997 |
| Number of topics: | 2763 |
| Total number of notes: | 5802 |
Date Of Receipt: 3-APR-1996 14:14:53.61
From: SMURF::WASTED::bozen "mark bozen USG 03-Apr-1996 1412"
To: odehelp@DEC:.zko.wasted
CC:
Subj: merge info in pthw1os file headers
I'm doing merges for pthw1os. After merging the files I'm supposed to see
merge information lines after the HISTORY line. I see this appear OK in one of
my files but another file I merged produces this warning:
Choose next merge action on ./kernel/io/dec/lsb/tlsb_iop.c
Abort, ok, edit, novisual, visual, [r]co, help [ok]
>> WARNING in bmerge:
>> No HISTORY marker found in file when adding merge ancestor information.
>> Continuing without merge ancestor information.
*** Done with merging './kernel/io/dec/lsb/tlsb_iop.c' ***
There doesn't appear to be any difference in the header formats between the
two files before I do the merges so I don't know why I get the merge ancestor
info in one file but not in another. Can you help?
- Mark
| T.R | Title | User | Personal Name | Date | Lines |
|---|---|---|---|---|---|
| 2190.1 | Re: merge info in pthw1os file headers | AOSG::FILTER | Automatic Posting Software - mail to flume::puck | Fri May 03 1996 13:04 | 35 |
Date Of Receipt: 3-APR-1996 14:24:13.51 From: SMURF::FLUME::"[email protected]" "03-Apr-1996 1421" To: [email protected] CC: [email protected] Subj: Re: merge info in pthw1os file headers It's not really important if you get it or not. I thought it may be helpful if we need to do a post-mortum, but it's not worth spending time debugging. As long as the file is merged OK - just submit. -Grant | I'm doing merges for pthw1os. After merging the files I'm supposed to see | merge information lines after the HISTORY line. I see this appear OK in one o f | my files but another file I merged produces this warning: | | Choose next merge action on ./kernel/io/dec/lsb/tlsb_iop.c | Abort, ok, edit, novisual, visual, [r]co, help [ok] | >> WARNING in bmerge: | >> No HISTORY marker found in file when adding merge ancestor information. | >> Continuing without merge ancestor information. | | *** Done with merging './kernel/io/dec/lsb/tlsb_iop.c' *** | | | There doesn't appear to be any difference in the header formats between the | two files before I do the merges so I don't know why I get the merge ancestor | info in one file but not in another. Can you help? | - Mark | |||||