From owner-freebsd-stable@FreeBSD.ORG Tue Nov 9 18:40:56 2004 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7178116A5AF for ; Tue, 9 Nov 2004 18:40:45 +0000 (GMT) Received: from shrike.submonkey.net (cpc2-cdif3-6-0-cust204.cdif.cable.ntl.com [81.103.67.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E1D843D1D for ; Tue, 9 Nov 2004 18:40:42 +0000 (GMT) (envelope-from setantae@submonkey.net) Received: from setantae by shrike.submonkey.net with local (Exim 4.43 (FreeBSD)) id 1CRav1-0003kC-G7; Tue, 09 Nov 2004 18:40:39 +0000 Date: Tue, 9 Nov 2004 18:40:38 +0000 From: Ceri Davies To: Ken Smith Message-ID: <20041109184038.GQ57641@submonkey.net> Mail-Followup-To: Ceri Davies , Ken Smith , Rob , freebsd-stable@freebsd.org References: <41907C91.9000706@yahoo.com> <20041109163455.GM16345@electra.cse.Buffalo.EDU> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="pJM5huthTAeUAjuT" Content-Disposition: inline In-Reply-To: <20041109163455.GM16345@electra.cse.Buffalo.EDU> X-PGP: finger ceri@FreeBSD.org User-Agent: Mutt/1.5.6i Sender: Ceri Davies cc: Rob cc: freebsd-stable@freebsd.org Subject: Re: standard-supfile = stable-supfile with 5.3 ? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 18:40:56 -0000 --pJM5huthTAeUAjuT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Nov 09, 2004 at 11:34:55AM -0500, Ken Smith wrote: > On Tue, Nov 09, 2004 at 05:15:13PM +0900, Rob wrote: >=20 > > The two files > >=20 > > /usr/src/share/examples/cvsup/standard-supfile > > /usr/src/share/examples/cvsup/stable-supfile > >=20 > > both have > >=20 > > *default release=3Dcvs tag=3DRELENG_5 > >=20 > > although the first one claims to download CURRENT. > >=20 > > And, eh, why is the filename "standard-supfile" and > > why not the more obvious "current-supfile" ? >=20 > I'm not sure I understand. How was your system brought up to the > new release - was it a CD install or cvsup-ed? If cvsup-ed what did > you use as the tag during the cvsup? >=20 > I'm seeing what you expect both in CVS and on a system installed from > CD: >=20 > harlow 1 % cd /usr/share/examples/cvsup/ > harlow 2 % grep "default release" standard-supfile stable-supfile > standard-supfile:*default release=3Dcvs tag=3DRELENG_5_3 > stable-supfile:*default release=3Dcvs tag=3DRELENG_5 > harlow 3 % uname -a > FreeBSD harlow.cse.buffalo.edu 5.3-RELEASE FreeBSD 5.3-RELEASE #3: Thu No= v 4 16:14:06 EST 2004 root@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys= /SMP i386 > harlow 4 % >=20 > The standard-supfile is meant for people who want to track the release > branch as Errata/Security updates get applied to it. Hmm. share/examples/cvsup/README says: To maintain the sources for the FreeBSD-current release, use: standard-supfile Main source tree ports-supfile Ports collection To maintain the sources for the FreeBSD-stable release, use: stable-supfile Main source tree This implies that standard-supfile should be changed to track -HEAD. It does make sense that it should track RELENG_X_Y (RELENG_5_3 in this case) though. > The stable-supfile > is meant for people who want to track the *development* branch, which > is not recommended for people who do not have the time to watch over > the freebsd-stable mailing list (on occasion mistakes do happen in the > development branch and other development work can at times cause > glitches people need to be aware of). stable-supfile is correct then; we just need to correct the README. Ceri --=20 Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. -- Einstein (attrib.) --pJM5huthTAeUAjuT Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBkQ8mocfcwTS3JF8RAt9UAJ9i2WS4jpGZwYJRcVH/4mDsD1bGBACgw+GX fSlwtSjh8wFS36bTZW0MY/E= =6pEA -----END PGP SIGNATURE----- --pJM5huthTAeUAjuT--