From owner-freebsd-stable  Sun Dec 29 10:37:42 1996
Return-Path: <owner-stable>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id KAA07284
          for stable-outgoing; Sun, 29 Dec 1996 10:37:42 -0800 (PST)
Received: from who.cdrom.com (who.cdrom.com [204.216.27.3])
          by freefall.freebsd.org (8.8.4/8.8.4) with ESMTP id KAA07279
          for <stable@freebsd.org>; Sun, 29 Dec 1996 10:37:40 -0800 (PST)
Received: from deceased.hb.north.de (deceased.hb.north.de [194.94.232.249])
          by who.cdrom.com (8.7.5/8.6.11) with SMTP id KAA22330
          for <stable@freebsd.org>; Sun, 29 Dec 1996 10:37:37 -0800 (PST)
Received: from jelal.hb.north.de by deceased.hb.north.de with uucp
	(Smail3.2) id m0veQ5t-0016FEC; Sun, 29 Dec 1996 19:36:21 +0100 (MET)
Received: by jelal.hb.north.de (SMail-ST 0.95gcc/2.5+)
	id AA00364; Sun, 29 Dec 1996 19:36:08 +0100 (CET)
Received: (from nox@localhost) by saturn.hb.north.de (8.7.5/8.7.3) id TAA01964; Sun, 29 Dec 1996 19:36:16 +0100 (MET)
Date: Sun, 29 Dec 1996 19:36:16 +0100 (MET)
From: Juergen Lock <nox@jelal.hb.north.de>
Message-Id: <199612291836.TAA01964@saturn.hb.north.de>
To: jkh@time.cdrom.com
Subject: sysinstall bad merge?  (was: Re: why is -stable not secure?)
Newsgroups: muc.lists.freebsd.stable
In-Reply-To: <17011.850837260@time.cdrom.com>
References: <Pine.BSF.3.95.961216232735.10949G-100000@alive.ampr.ab.ca>
Organization: none
Cc: stable@freebsd.org
Sender: owner-stable@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

In article <17011.850837260@time.cdrom.com> you write:
>> I started this thread for a reason.  I'm trying to figure out the best way
>> for me, and any other willing souls, to try to make this work.  I am not
>
>Some committer agrees to act as front-man for the 2.1-stable branch,
>also working with Richard Wackerbarth in making sure that services
>like CTM delta generation and such continue to work.  That's really
>all it's going to take.
>
>						Jordan

On a related note, make release on -stable yesterday got me this:

 ...
cc -O2 -pipe -Wall -I/usr/src/release/sysinstall/../../gnu/lib/libdialog -I/usr/src/release/sysinstall -I/sys -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG   -c globals.c
cc -O2 -pipe -Wall -I/usr/src/release/sysinstall/../../gnu/lib/libdialog -I/usr/src/release/sysinstall -I/sys -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG   -c index.c
index.c: In function `index_get':
index.c:249: warning: passing arg 1 of `index_read' makes integer from pointer without a cast
index.c: At top level:
index.c:256: conflicting types for `index_read'
sysinstall.h:476: previous declaration of `index_read'
index.c: In function `index_menu':
index.c:495: warning: implicit declaration of function `SAFE_STRCPY'
*** Error code 1

Stop.
*** Error code 1

Stop.
*** Error code 1

Stop.

 now do i have a broken repository or do others see this too?

 thanx & cheers,
	Juergen