From owner-freebsd-current@FreeBSD.ORG Fri Aug 14 13:50:39 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CDCC106568E for ; Fri, 14 Aug 2009 13:50:39 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 277808FC59 for ; Fri, 14 Aug 2009 13:50:39 +0000 (UTC) Received: from fledge.watson.org (fledge.watson.org [65.122.17.41]) by cyrus.watson.org (Postfix) with ESMTPS id CE7A446B0C; Fri, 14 Aug 2009 09:50:38 -0400 (EDT) Date: Fri, 14 Aug 2009 14:50:38 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Andreas Tobler In-Reply-To: <4A847AA5.1030701@fgznet.ch> Message-ID: References: <4A847AA5.1030701@fgznet.ch> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: freebsd-current Subject: Re: 8.0-stable/releng? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 14 Aug 2009 13:50:39 -0000 On Thu, 13 Aug 2009, Andreas Tobler wrote: > for the record, am I correct that the upcoming 8.0 branch is like this: > > svn ls svn://svn.freebsd.org/base/stable/ .. 8/ ? > > And not under 'releng'? > > I'm a bit confused about naming conventions, releng vs. stable. I have no > problem with either, but which one is the one to be used for BETA-3/RC? > > Is head becoming 9.0 soon? Existing documentation about branch naming (-CURRENT, -STABLE, -RELEASE, etc) remains essentially valid. The primary change of note is that in Subversion, we now include "stable" in the branch name for -STABLE branches, rather than using "releng" for that as well. The following should apply: base/head - -CURRENT base/stable/X - X-STABLE branches base/releng/X.Y - X.Y release engineering branches base/release/X.Y.Z - X.Y.Z release tag stable/8 has been created, but neither releng/8.0 nor release/8.0.0 have been created. Because the release process involves some non-atomic windows, things are currently potentially confusing -- uname -a on head and stable/8 both report BETA2, and the two branches are being kept in lock-step in the lead-up to BETA3, after which point the brannches will diverge. I'm not quite sure when head will start calling itself 9-CURRENT, but probably pretty soon. Robert N M Watson Computer Laboratory University of Cambridge