Date: Thu, 02 May 2002 15:02:56 -0700 From: Terry Lambert <tlambert2@mindspring.com> To: bmah@FreeBSD.ORG Cc: Dave Hayes <dave@jetcafe.org>, freebsd-hackers@FreeBSD.ORG, freebsd-stable@FreeBSD.ORG Subject: Re: Difference between RELENG_* and RELENG_*_BP Message-ID: <3CD1B790.DB547674@mindspring.com> References: <200205022047.g42Klxb84582@hokkshideh2.jetcafe.org> <3CD1ACD6.5B2432DF@mindspring.com> <200205022128.g42LSXjr072995@intruder.bmah.org>
next in thread | previous in thread | raw e-mail | index | archive | help
"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. ??? http://www.freebsd.org/doc/en_US.ISO8859-1/articles/releng/release-proc.html "The next step is to create a branch point tag, so that diffs against the start of the branch are easier with CVS: /usr/src# cvs rtag -rRELENG_4 RELENG_4_4_BP src And then a new branch tag is created with: /usr/src# cvs rtag -b -rRELENG_4_4_BP RELENG_4_4 src 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 ------------------ ------------------------------------------- -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"). > 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-). -- Terry To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3CD1B790.DB547674>