From owner-freebsd-questions@FreeBSD.ORG Sat Dec 4 00:41:00 2010 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59A1C106566B for ; Sat, 4 Dec 2010 00:41:00 +0000 (UTC) (envelope-from rwmaillists@googlemail.com) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id DBD7E8FC15 for ; Sat, 4 Dec 2010 00:40:59 +0000 (UTC) Received: by wwf26 with SMTP id 26so5796662wwf.31 for ; Fri, 03 Dec 2010 16:40:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:in-reply-to:references:x-mailer:mime-version :content-type:content-transfer-encoding; bh=nzOm5f+Xj4L45g8nXle8hVs15MbqfrQi4vBEQBXlkFA=; b=QtjLhi6LQJYuN303zUqdVMkoA41Tpc2EEQaEhDm162HBkfrmpnZ78JsAYjpWE1k3OQ aTPJ8nPMUezgXsDo7pqkGsXKzWSDk1vzgArcTdqZBHzg/5qNhR0Nq061/azFv54b3jH5 70UdgPAboHYkPcng4JO+/UDBHmclePhHUQlcA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=date:from:to:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type:content-transfer-encoding; b=IWbYNZ2gtN6PM4MEs44Q76DcmbDSBtkSknaWQB43N9uvCTi/394VtKtUc6aTKfW0To 34/RNbqGcSmEI6+q0sVkmw4LzHz6OLkFIClr2VwFpj7XC9nDDSut4CMOR+P3dGan+WQj BfAMWPZOC065g/IKAFJEPDL9OQEeUUusCn99w= Received: by 10.227.137.138 with SMTP id w10mr2716252wbt.19.1291423257962; Fri, 03 Dec 2010 16:40:57 -0800 (PST) Received: from gumby.homeunix.com (bb-87-81-140-128.ukonline.co.uk [87.81.140.128]) by mx.google.com with ESMTPS id m10sm1676947wbc.10.2010.12.03.16.40.56 (version=SSLv3 cipher=RC4-MD5); Fri, 03 Dec 2010 16:40:56 -0800 (PST) Date: Sat, 4 Dec 2010 00:40:53 +0000 From: RW To: freebsd-questions@freebsd.org Message-ID: <20101204004053.4ad2c16c@gumby.homeunix.com> In-Reply-To: References: <20101203162633.2a84687d@gumby.homeunix.com> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.22.1; i386-portbld-freebsd8.1) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: RELEASE vice CURRENT vice STABLE X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2010 00:41:00 -0000 On Fri, 3 Dec 2010 18:02:43 +0000 (UTC) JB wrote: > On Fri, 03 Dec 2010 16:26:33 +0000, RW wrote: > > Broadly n-STABLE branch-off from CURRENT and release security > > branches branch-off from a STABLE branch. Release candidates are > > usually points on a Stable Branch, and releases are points on the > > security branch. Occasionally it has been bit more complicated. > > _______________________________________________ > > freebsd-questions@freebsd.org mailing list > > http://lists.freebsd.org/mailman/listinfo/freebsd-questions To > > unsubscribe, send any mail to > > "freebsd-questions-unsubscribe@freebsd.org" > > Thanks RW, > this is how I visualize it: > > 8.1-RELEASE -> 8.2-CURRENT -> 8.2-STABLE -> 8.2-RCn -> 8.2-RELEASE > > CURRENT branch branches off RELEASE branch; That may have effectively happened in the distant past, but it's not the norm. CURRENT is the one branch that's updated indefinitely, it's the continuous line of development where all new work is done. The term 9-CURRENT simply refers to CURRENT between the branching of 8-STABLE and the branching of 9-STABLE. Likewise 8.2-STABLE is 8-STABLE between between the branching of 8.1 and 8.2 release branches. There is no such thing as 8.2-CURRENT. This aspect, where different bits of a branch have different names is IMO needlessly confusing. > STABLE branch branches off CURRENT branch; yes > Release Security branch branches off STABLE branch; yes > RCn are usually points (snapshots) on STABLE branch; yes > RELEASE is a point (snapshot) on STABLE branch; *A* release is a point on a security branch (i.e. release branch) which is branched-off a stable branch. > RELEASE is a point (snapshot) on Release Security branch; The original release is followed by point releases with security updates, these all occur on that branch. > Occasionally it has been a bit more complicated -:) There's a diagram somewhere (in the handbook I think) that shows the convoluted history of the early branches. > Still not sure about: > CURRENT (off RELEASE branch at time of release ?) no, that's wrong. > RC (why "usually" ?) Once a release security branch is created, any late RCs have to go in that. > RELEASE (only one valid, or both, depending on circumstances ?) There are many releases and release branches - only a subset is officially supported by the security team.