From owner-freebsd-current@FreeBSD.ORG Wed Aug 18 07:54:21 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D62F16A4CE; Wed, 18 Aug 2004 07:54:21 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48EAC43D49; Wed, 18 Aug 2004 07:54:20 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i7I7sB4W001191 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 18 Aug 2004 10:54:13 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.1/8.13.1) id i7I7sCVs070371; Wed, 18 Aug 2004 10:54:12 +0300 (EEST) (envelope-from ru) Date: Wed, 18 Aug 2004 10:54:11 +0300 From: Ruslan Ermilov To: Scott Long , Jon Noack Message-ID: <20040818075411.GA91053@ip.net.ua> References: <200408180021.i7I0LCCK020175@repoman.freebsd.org> <20040818002136.03A8B16A524@hub.freebsd.org> <20040818060547.GB6348@ip.net.ua> <412301F0.2070307@alumni.rice.edu> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="MGYHOYXEY6WxJCY8" Content-Disposition: inline In-Reply-To: <412301F0.2070307@alumni.rice.edu> User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new cc: current@FreeBSD.org Subject: Re: [src] cvs commit: src/sys/sys param.h src/sys/conf newvers.sh X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2004 07:54:21 -0000 --MGYHOYXEY6WxJCY8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 18, 2004 at 02:14:56AM -0500, Jon Noack wrote: > On 08/18/04 01:05, Ruslan Ermilov wrote: > >On Wed, Aug 18, 2004 at 12:21:36AM +0000, Scott Long wrote: > >>Index: src/sys/sys/param.h > > > >[...] > > > >> * scheme is: <0 if release branch, otherwise= =20 > >> 1>xx > >> */ > >> #undef __FreeBSD_version > >>-#define __FreeBSD_version 502128 /* Master, propagated to newvers */ > >>+#define __FreeBSD_version 600000 /* Master, propagated to newvers */ > > ^^^^^^ > >I believe this should be 600100, or are we changing the scheme > >again? >=20 > No, 600000 is correct. The reason is that 600100 will be used for=20 > 6-CURRENT *after* a 6.0-RELEASE. 6-CURRENT before and *including*=20 > 6.0-RELEASE should follow the 6000xx scheme. Note that this is=20 > unchanged from the way 5-CURRENT and 5.0-RELEASE (which ended up being=20 > 500043) were handled: > http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/freebsd= -versions.html >=20 You're right. I was confused by a misleading comment in : scheme is: <0 if release branch, otherwise 1>xx This should actually read: scheme is: Rxx R is 0 if release branch or x.0-CURRENT before RELENG_x_0 is created, otherwise 1 Scott, would this be an appropriate time now to discuss my proposals to the release naming, and what would be an appropriate forum then? Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --MGYHOYXEY6WxJCY8 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (FreeBSD) iD8DBQFBIwsjqRfpzJluFF4RAkJrAJ96sD+mT+77N2jgOdAfW8ZH5WXvEQCfWYC5 HdjOY+u491bZrea5OH5AHaU= =tI7s -----END PGP SIGNATURE----- --MGYHOYXEY6WxJCY8--