| Date Of Receipt: 6-OCT-1993 18:40:54.61
From: WASTED::"johnf%[email protected]"
To: keane@dec:.zko.giants (Brian Keane)
CC: wasted::odehelp, giants::keane, [email protected]
Subj: Re: Problem with merge submit
It means Spider may have taken care of the submit for you. He was merging
all the Makefiles that were involved in the "multi-architecture" pool changes
early in Sterling [done by Mike Fairbrother]. This must have been one of
the files originally re-worked by Mike. I believe, that since Spider merged
it, that you don't need to worry about it anymore. I would, however, take
a look at the file after Spider has submitted it [and I believe he is done]
to make sure it looks okay.
Sorry for any confusion.
John
|
| Date Of Receipt: 4-JAN-1995 14:56:43.87
From: SMURF::ALPHA::"[email protected]"
To: [email protected]
CC:
Subj: Problem with merge
Help! -
I just tried to do a bsubmit of a module and it reported that there
was a merge required. I have never done one before. I took the
default answers and did what I thought was required, yet when all
done, it appears that the file now contains NEITHER of the fixes.
Or is it possible that the changed module just hasn't made it into
the support pool yet and therefore I don't see it, or what?
The specifics:
v13supportos pool, file kernel/netinet/tcp_output.c, my
revision should have been 4.3.18.2
a mklinks now gets me version 4.3.3.3
Megan
|