From owner-freebsd-current@FreeBSD.ORG  Wed Aug 18 07:15:00 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
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 350BF16A4CE
	for <current@FreeBSD.org>; Wed, 18 Aug 2004 07:15:00 +0000 (GMT)
Received: from smtp003.bizmail.yahoo.com (smtp003.bizmail.yahoo.com
	[216.136.130.195])
	by mx1.FreeBSD.org (Postfix) with SMTP id E35BC43D49
	for <current@FreeBSD.org>; Wed, 18 Aug 2004 07:14:59 +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 smtp003.bizmail.yahoo.com with SMTP; 18 Aug 2004 07:14:59 -0000
Received: from localhost (localhost [127.0.0.1])
	by optimator.noacks.org (Postfix) with ESMTP id A1C106243;
	Wed, 18 Aug 2004 02:14:58 -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-01; Wed, 18 Aug 2004 02:14:57 -0500 (CDT)
Received: from compgeek.noacks.org (compgeek [192.168.1.10])
	by optimator.noacks.org (Postfix) with ESMTP id 407E1620A;
	Wed, 18 Aug 2004 02:14:57 -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 i7I7Euax028537;
	Wed, 18 Aug 2004 02:14:56 -0500 (CDT)
	(envelope-from noackjr@alumni.rice.edu)
Message-ID: <412301F0.2070307@alumni.rice.edu>
Date: Wed, 18 Aug 2004 02:14:56 -0500
From: Jon Noack <noackjr@alumni.rice.edu>
User-Agent: Mozilla Thunderbird 0.7.3 (X11/20040806)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Ruslan Ermilov <ru@FreeBSD.org>
References: <200408180021.i7I0LCCK020175@repoman.freebsd.org>
	<20040818002136.03A8B16A524@hub.freebsd.org> <20040818060547.GB6348@ip.net.ua>
In-Reply-To: <20040818060547.GB6348@ip.net.ua>
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 <scottl@FreeBSD.org>
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
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Aug 2004 07:15:00 -0000

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:  <major><two digit minor><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

Jon