Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 02 May 2002 15:46:33 -0700
From:      Terry Lambert <tlambert2@mindspring.com>
To:        Brooks Davis <brooks@one-eyed-alien.net>
Cc:        Drew Tomlinson <drew@mykitchentable.net>, bmah@FreeBSD.ORG, Dave Hayes <dave@jetcafe.org>, freebsd-hackers@FreeBSD.ORG, freebsd-stable@FreeBSD.ORG
Subject:   Re: Difference between RELENG_* and RELENG_*_BP
Message-ID:  <3CD1C1C9.9934C969@mindspring.com>
References:  <200205022047.g42Klxb84582@hokkshideh2.jetcafe.org> <3CD1ACD6.5B2432DF@mindspring.com> <200205022128.g42LSXjr072995@intruder.bmah.org> <3CD1B790.DB547674@mindspring.com> <01c501c1f226$ecd7cfd0$6e2a6ba5@lc.ca.gov> <20020502152615.A4030@Odin.AC.HMC.Edu>

next in thread | previous in thread | raw e-mail | index | archive | help
Brooks Davis wrote:
> On Thu, May 02, 2002 at 03:15:53PM -0700, Drew Tomlinson wrote:
> > I'm just trying to understand. :)  How is RELENG_X_Y_BP different from
> > RELENG_X_Y_RELEASE?
> 
> RELENG_X_Y_BP is the point on RELENG_X where the RELENG_X_Y branch was
> created.  RELENG_X_Y_0_RELEASE is the point on the RELENG_X_Y branch
> which corresponds to what ends up in the actual release.  It generally
> has a few changes relative to the branch point point, but not too many.
> RELENG_X_Y_BP is mostly an artifact of the way CVS works and is of little
> if any real intrest.  There certaintly isn't any real point in checking
> it out.

Exactly.  It's there to branch, and to provide something so you
can "cvs diff -r RELENG_X_Y_BP" a checked out tree to get patches
to move them between parallel heads (-STABLE vs. -SECURITY) that
supposedly contain "some of the same code" and "more of the same
code", both "relative to the same branch point".

-STABLE is called -STABLE these days, but RELENG_X -STABLE is
really RELENG_X_Y + changes pending RELENG_X_(Y+1).  Way back
when, I think we had a long knock-down drag-out fight about
naming of -STABLE vs. -DEVEL, and the expectations users have
about the resulting code.  That was where -SECURITY showed up:
-SECURITY is a "stable version of -STABLE" (as if things weren't
exciting enough... 8-) 8-)).

-- Terry

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3CD1C1C9.9934C969>