Conference smurf::buildhelp

304.0. "merge markers" by SMURF::FILTER (Automatic Posting Software - mail to flume::puck) Fri Sep 03 1993 17:59

Date Of Receipt: 	 3-SEP-1993 16:10:31.05
From: 	FLUME::"[email protected]" "Joe Kenny USG"
To: 	[email protected]
CC: 	
Subj: 	merge markers

Getting complaints that merge markers are in submit. But when
Joe Martin looks at the .c file, there are no markers. Any ideas?
Joe

------- Forwarded Message

Return-Path: [email protected] 
Delivery-Date: Fri, 03 Sep 93 15:37:39 -0400
Return-Path: [email protected]
Received: by flume.zk3.dec.com (5.65/DEC-USSG-ZK3-ULTRIX-09/27/91);
	id AA09643; Fri, 3 Sep 1993 15:37:32 -0400
Received: by abyss.zk3.dec.com (5.65/DEC-USSG-ZK3-ULTRIX-09/27/91);
	id AA26540; Fri, 3 Sep 1993 15:37:07 -0400
Received: by telemann.zk3.dec.com; id AA08555; Fri, 3 Sep 1993 15:37:05 -0400
Message-Id: <[email protected]>
To: [email protected]
Cc: [email protected], [email protected]
Subject: Re: Merge markers 
In-Reply-To: Your message of Fri, 03 Sep 93 15:12:00 -0400.
	<[email protected]> 
Date: Fri, 03 Sep 93 15:37:04 -0400
From: "Joseph A. Martin - Alpha memory management" <[email protected]>
X-Mts: smtp

Joe,
I checked vm/vm_resident.c and couldn't find any.  The way I read the
log file, it's ./isl/sifsync.sh and ./usr/sbin/updadmin/updadmin.sh
that are being queried.  Could they have been corrected interactively
during the submit?  

\Joe   [DTN 381-2872 (-2257 FAX)	Joseph A. Martin
 [email protected]			Digital Equipment Corporation
					110 Spitbrook Rd.  ZKO3-3/U14
 (603) 881-2872 (-2257 FAX)		Nashua, NH  03062  U.S.A.
 ]
  >>Subject: AGOSMINOR submits for Fri Sep  3 15:01:25 EDT 1993
  >>
  >>=================================================================
  >>>> 
  >>>> WARNING! THE FOLLOWING FILES IN THIS SUBMIT STILL HAVE
  >>>> BMERGE MARKER LINES IN THE TEXT -- THIS MUST BE CORRECTED
  >>>> 
  >>
  >>./isl/sifsync.sh
  >>190:============================================
  >>192:============================================" >> $ORPHAN_FILE
  >>229:============================================
  >>231:============================================" >> $CUSTOM_FILE
  >>
  >>./usr/sbin/updadmin/updadmin.sh
  >>297:===================================================================
  >>303:==================================================================="
  >>
  >>=================================================================
  >>
[...lots of intervening stuff...]
  >>
  >>
  >>Submitted by Jonathan Wallace; User name: jon; Node name: rotten.zk3.dec.
   com
  >>Date: 9/3/93; Time: 14:47
  >>Coordinated Universal Time: 09/03/93 18:47:58 GMT
  >>Number of files: 4; Defect number: agosminor-1084-jon.
  >>Set name: Jonathan_Wallace_agminor; Sandbox: /var/home/users/jon/sb/agmin
   or
  >>List of files and revisions:
  >>./isl/Makefile,v	4.2.18.9
  >>./isl/root.inv,v	1.1.6.16
  >>./isl/sifsync.sh,v	1.1.2.6
  >>./usr/sbin/updadmin/updadmin.sh,v	1.1.2.3
  >>
  >>Detailed description:
  >>
  >>[ ./isl/Makefile ]
  >>Added merge subdirectory
  >>[1993/08/27  20:43:05  Jonathan_Wallace]
  >>
  >>Took out installupdate and updadmin.
  >>[1993/08/23  20:59:50  Jonathan_Wallace]
  >>[ ./isl/root.inv ]
  >>Modified installupdate to be pulled from sbin
  >>Modified updadmin to be pulled from usr/sbin
  >>[1993/08/23  20:59:56  Jonathan_Wallace]
  >>[ ./isl/sifsync.sh ]
  >>Put braces around test areas in Udelta
  >>[1993/08/23  21:00:13  Jonathan_Wallace]
  >>[ ./usr/sbin/updadmin/updadmin.sh ]
  >>Code restructure
  >>[1993/09/03  18:47:37  Jonathan_Wallace]
  >>
  >>Changed message context if updinfo is not located.
  >>[1993/08/30  20:27:46  Jonathan_Wallace]
  >>
  >>Enabled delete option for customized files
  >>[1993/08/23  21:04:49  Jonathan_Wallace]
  >>


------- End of Forwarded Message