From owner-freebsd-stable Thu May 2 15:18:24 2002 Delivered-To: freebsd-stable@freebsd.org Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by hub.freebsd.org (Postfix) with ESMTP id BCF9937B41E; Thu, 2 May 2002 15:18:07 -0700 (PDT) Received: from bmah.dyndns.org ([12.233.149.189]) by rwcrmhc51.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020502221807.QAYI9799.rwcrmhc51.attbi.com@bmah.dyndns.org>; Thu, 2 May 2002 22:18:07 +0000 Received: from intruder.bmah.org (localhost [127.0.0.1]) by bmah.dyndns.org (8.12.3/8.12.3) with ESMTP id g42MI7cB073673; Thu, 2 May 2002 15:18:07 -0700 (PDT) (envelope-from bmah@intruder.bmah.org) Received: (from bmah@localhost) by intruder.bmah.org (8.12.3/8.12.3/Submit) id g42MI6c4073672; Thu, 2 May 2002 15:18:06 -0700 (PDT) Message-Id: <200205022218.g42MI6c4073672@intruder.bmah.org> X-Mailer: exmh version 2.5+ 20020416 with nmh-1.0.4 To: Terry Lambert Cc: bmah@FreeBSD.org, Dave Hayes , freebsd-hackers@FreeBSD.org, freebsd-stable@FreeBSD.org Subject: Re: Difference between RELENG_* and RELENG_*_BP In-reply-to: <3CD1B790.DB547674@mindspring.com> References: <200205022047.g42Klxb84582@hokkshideh2.jetcafe.org> <3CD1ACD6.5B2432DF@mindspring.com> <200205022128.g42LSXjr072995@intruder.bmah.org> <3CD1B790.DB547674@mindspring.com> Comments: In-reply-to Terry Lambert message dated "Thu, 02 May 2002 15:02:56 -0700." From: bmah@FreeBSD.org (Bruce A. Mah) Reply-To: bmah@FreeBSD.org X-Face: g~c`.{#4q0"(V*b#g[i~rXgm*w;:nMfz%_RZLma)UgGN&=j`5vXoU^@n5v4:OO)c["!w)nD/!!~e4Sj7LiT'6*wZ83454H""lb{CC%T37O!!'S$S&D}sem7I[A 2V%N&+ X-Image-Url: http://www.employees.org/~bmah/Images/bmah-cisco-small.gif X-Url: http://www.employees.org/~bmah/ Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 02 May 2002 15:18:06 -0700 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 If memory serves me right, Terry Lambert wrote: > "Bruce A. Mah" wrote: > > > either for a code slush, > > > or for other work that may not make it back in until it's > > > complete, which might take a while. > > > > Nope. The original poster asked about RELENG_* branches; they aren't > > used that way, which I'm sure you know. > > ??? What I'm saying is that we almost never put something on a RELENG_* branch until it "make[s] it back in" to HEAD. Instead, changes get merged *from* HEAD *to* a RELENG_4 branch. Your original text gave what I thought was an erroneous impression. > I guess it's not obvious, since FreeBSD refers to things in > general a little differently: > > ------------------ ------------------------------------------- > The tag What people commonly call it > ------------------ ------------------------------------------- > RELENG_X -STABLE (X.x branch) > RELENG_X_Y_RELEASE -RELEASE (version X.Y) > RELENG_X_Y -SECURITY (X.Y branch) > RELENG_X_Y_BP RELENG_X at the time RELENG_X_Y was created > ------------------ ------------------------------------------- We don't have RELENG_X_Y_RELEASE tags, they're really RELENG_X_Y_0_RELEASE. But that's a bit of a nitpick. You're essentially right. > -STABLE is "other work that may not make it back in until > it's complete" relative to -SECURITY, and RELENG_(X+1) in > progress the same, relative to -STABLE (but you have an > implied tag that doesn't exist until it's "complete"). ENOPARSE > > Anyone wanting more information about how we *really* use the RELENG_* > > branches should take a read through Murray Stokely's release > > engineering article: > > > > http://www.freebsd.org/doc/en_US.ISO8859-1/articles/releng/index.html > > Yes; this is a very good document. Unfortunately, it doesn't > provide a translation from RELENG-speak into mailing list speak; > the diagram doesn't really show a derivation relationship quite > correctly. Really, you need a tird dimention, or an angled line > in the diagram to get it right (particularly X.Y-STABLE). He did > a much better one on the whiteboard. Satoshi does a pretty good > one on a whiteboard, too; so does Julian. 8-). Yeah. Been too long since I used pic though...I wonder where my Tenth Edition UNIX manuals went to... Bruce. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message