From owner-freebsd-current@FreeBSD.ORG Wed Aug 18 07:37:43 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 4B04916A4D0 for ; Wed, 18 Aug 2004 07:37:43 +0000 (GMT) Received: from smtp005.bizmail.sc5.yahoo.com (smtp005.bizmail.sc5.yahoo.com [66.163.175.82]) by mx1.FreeBSD.org (Postfix) with SMTP id 209C343D2D for ; Wed, 18 Aug 2004 07:37:43 +0000 (GMT) (envelope-from noackjr@alumni.rice.edu) Received: from unknown (HELO optimator.noacks.org) (noackjr@supercrime.org@70.240.234.183 with login) by smtp005.bizmail.sc5.yahoo.com with SMTP; 18 Aug 2004 07:37:42 -0000 Received: from localhost (localhost [127.0.0.1]) by optimator.noacks.org (Postfix) with ESMTP id 259716243; Wed, 18 Aug 2004 02:37:42 -0500 (CDT) Received: from optimator.noacks.org ([127.0.0.1]) by localhost (optimator.noacks.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 59245-02; Wed, 18 Aug 2004 02:37:40 -0500 (CDT) Received: from compgeek.noacks.org (compgeek [192.168.1.10]) by optimator.noacks.org (Postfix) with ESMTP id CED04620A; Wed, 18 Aug 2004 02:37:40 -0500 (CDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by compgeek.noacks.org (8.13.1/8.13.1) with ESMTP id i7I7beEs028619; Wed, 18 Aug 2004 02:37:40 -0500 (CDT) (envelope-from noackjr@alumni.rice.edu) Message-ID: <41230744.5030504@alumni.rice.edu> Date: Wed, 18 Aug 2004 02:37:40 -0500 From: Jon Noack User-Agent: Mozilla Thunderbird 0.7.3 (X11/20040806) X-Accept-Language: en-us, en MIME-Version: 1.0 To: noackjr@alumni.rice.edu References: <200408180021.i7I0LCCK020175@repoman.freebsd.org> <20040818002136.03A8B16A524@hub.freebsd.org> <20040818060547.GB6348@ip.net.ua> <412301F0.2070307@alumni.rice.edu> In-Reply-To: <412301F0.2070307@alumni.rice.edu> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new at noacks.org cc: Scott Long cc: Ruslan Ermilov 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 Reply-To: noackjr@alumni.rice.edu 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:37:43 -0000 On 08/18/04 02:14, 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 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? > > No, 600000 is correct. The reason is that 600100 will be used for > 6-CURRENT *after* a 6.0-RELEASE. 6-CURRENT before and *including* > 6.0-RELEASE should follow the 6000xx scheme. Note that this is > unchanged from the way 5-CURRENT and 5.0-RELEASE (which ended up being > 500043) were handled: > http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/freebsd-versions.html This feels really Linux, but I'll throw it out anyway: Perhaps pre-n.0 (prior to a major release, in other words) should use an (n-1)999xx numbering scheme so that n.0 can be n00000. For instance, 6-CURRENT would start at 599900. That would allow 6.0 to be 600000. Numbering after the n.0 release would remain the same as it is now. There may be places were 600000 is hardcoded in the source (BURN_BRIDGES comes to mind), but that could be fixed. I feel like I'm having my own personal bikeshed over this issue, but it annoys me we can't tag an n.0 release as n00000. Oh well, it's probably not important enough to change so I'll go to sleep before someone can properly embarrass me about this. Jon