From owner-freebsd-stable Fri Jul 12 11:27:11 2002 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 6490537B401; Fri, 12 Jul 2002 11:27:07 -0700 (PDT) Received: from absinthe.condo.chico.ca.us (adsl-64-169-154-205.dsl.chic01.pacbell.net [64.169.154.205]) by mx1.FreeBSD.org (Postfix) with ESMTP id A18BE43E42; Fri, 12 Jul 2002 11:26:59 -0700 (PDT) (envelope-from fred@absinthe2.dyndns.org) Received: from absinthe2.dyndns.org (localhost [127.0.0.1]) by absinthe.condo.chico.ca.us (8.12.3/8.12.3) with ESMTP id g6CIQsE4080426; Fri, 12 Jul 2002 11:26:54 -0700 (PDT) (envelope-from fred@absinthe2.dyndns.org) Received: (from fred@localhost) by absinthe2.dyndns.org (8.12.3/8.12.3/Submit) id g6CIQjIe080425; Fri, 12 Jul 2002 11:26:45 -0700 (PDT) (envelope-from fred) Date: Fri, 12 Jul 2002 11:26:45 -0700 From: Fred Condo To: "Jacques A. Vidrine" Cc: Alexandr Kovalenko , Murray Stokely , "Sergey A. Osokin" , Murray Stokely , stable@FreeBSD.ORG Subject: Re: Upcoming 4.6.1 Message-ID: <20020712182645.GB80296@absinthe.condo.chico.ca.us> References: <20020707015520.E11035@freebsdmall.com> <20020708091849.GC9340@nevermind.kiev.ua> <20020708093008.GC61953@freebsd.org.ru> <20020708075902.G20410@freebsdmall.com> <20020712160443.GK45527@nevermind.kiev.ua> <20020712165258.GB87571@madman.nectar.cc> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020712165258.GB87571@madman.nectar.cc> User-Agent: Mutt/1.4i Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, Jul 12, 2002 at 11:52:58AM -0500, Jacques A. Vidrine wrote: > On Fri, Jul 12, 2002 at 07:04:43PM +0300, Alexandr Kovalenko wrote: > > On Mon, Jul 08, 2002 at 07:59:02AM -0700, Murray Stokely wrote: > > > We will follow the existing tag nomenclature. A RELENG_4_6_1_RELEASE > > > tag will be created on the RELENG_4_6 branch. > > > > And what will be security branch for 4.6.1-RELEASE? Or will > > 4.6-RELEASE-pX became 4.6.1-RELEASE-pX ? > > 4.6-RELEASE RELENG_4_6_0_RELEASE > 4.6-RELEASE-pX RELENG_4_6 Sorry to pick nits, but the line above may confuse some readers. I conclude from the comments below and the nature of CVS branches that, for a system tracking RELENG_4_6, the output of uname -r immediately after the tags for 4.6.1 are laid down will be 4.6.1-RELEASE, and that any security patches on the branch thereafter will result in output of the form 4.6.1-RELEASE-pY. I'm certain this is what you meant, of course. Part of the problem is that the question was ill-posed, in that it assumed that labels such as 4.6-RELEASE are examples of branches, when the term 'branch' properly refers only to CVS branch tags such as RELENG_4_6. > 4.6.1-RELEASE RELENG_4_6_1_RELEASE > 4.6.1-RELEASE-pY RELENG_4_6 > > If you are following the security branch, you need do nothing > special... it will become 4.6.1-RELEASE and then 4.6.1-RELEASE-p1 and > so on. > > Just be sure to read src/UPDATING, as always, for important > information. > -- Fred Condo - fred@condo.chico.ca.us To assert that the earth revolves around the sun is as erroneous as to claim that Jesus was not born of a virgin. -- Cardinal Bellarmine at Galileo's trial To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message