[Search for users] [Overall Top Noters] [List of all Conferences] [Download this site]

Conference smurf::buildhelp

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

370.0. "Problem with merge submit" by SMURF::FILTER (Automatic Posting Software - mail to flume::puck) Fri Oct 08 1993 20:22

Date Of Receipt: 	 6-OCT-1993 17:30:42.80
From: 	WASTED::"keane@giants.zko.dec.D5NET.dec.com"
To: 	wasted::odehelp
CC: 	giants::keane
Subj: 	Problem with merge submit

What does this message mean?

Brian

csh> bstat -all

[ ./usr/shlib/DECthreads/Makefile ]
version 1.1.21.2 selected
csh> bsubmit -defect goldos-merge-sterlingbl6 -auto_out -all
File: ./usr/shlib/DECthreads/Makefile
is held by: Spider_Boardman; Date: 10/6/93; Time: 17:21

- No work has been done for this submission.
- No files have been changed in any way.
- The files in this submission are not held.
- The use of the -resub option is not required and will not be recognized.
T.RTitleUserPersonal
Name		DateLines
370.1Re: Problem with merge submitSMURF::FILTERAutomatic Posting Software - mail to flume::puckFri Oct 08 1993 20:2518
Date Of Receipt: 	 6-OCT-1993 18:40:54.61
From: 	WASTED::"johnf%zk3.dec.com@alpha.zko.dec.D5NET.dec.com"
To: 	keane@dec:.zko.giants (Brian Keane)
CC: 	wasted::odehelp, giants::keane, johnf@zk3.dec.com
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
370.2Problem with mergeAOSG::FILTERAutomatic Posting Software - mail to flume::puckWed Jan 04 1995 18:4925
Date Of Receipt: 	 4-JAN-1995 14:56:43.87
From: 	SMURF::ALPHA::"gentry@grok.zk3.dec.com"
To: 	odehelp@zk3.dec.com
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