From owner-freebsd-newbies@FreeBSD.ORG Thu Jun 3 00:06:56 2004 Return-Path: Delivered-To: freebsd-newbies@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A07316A4CE for ; Thu, 3 Jun 2004 00:06:56 -0700 (PDT) Received: from bilbo.otenet.gr (bilbo.otenet.gr [195.170.0.13]) by mx1.FreeBSD.org (Postfix) with ESMTP id 853FB43D1F for ; Thu, 3 Jun 2004 00:06:55 -0700 (PDT) (envelope-from keramida@ceid.upatras.gr) Received: from orion.daedalusnetworks.priv (aris.bedc.ondsl.gr [62.103.39.226])i5376fmk018274; Thu, 3 Jun 2004 10:06:47 +0300 Received: from orion.daedalusnetworks.priv (orion.daedalusnetworks.priv [127.0.0.1])i537CQM8005013; Thu, 3 Jun 2004 10:12:26 +0300 Received: (from keramida@localhost)i537CQgE005012; Thu, 3 Jun 2004 10:12:26 +0300 X-Authentication-Warning: orion.daedalusnetworks.priv: keramida set sender to keramida@ceid.upatras.gr using -f Date: Thu, 3 Jun 2004 10:12:26 +0300 From: George Keramidas To: David Fuchs Message-ID: <20040603071226.GD4918@orion.daedalusnetworks.priv> References: <40BEA0BA.6020709@davidfuchs.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <40BEA0BA.6020709@davidfuchs.ca> cc: freebsd-newbies@freebsd.org Subject: Re: CVS Tags X-BeenThere: freebsd-newbies@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Gathering place for new users List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2004 07:06:56 -0000 On 2004-06-02 20:53, David Fuchs wrote: > Maybe I'm the only one confused by this, but would someone mind stating > plainly what the difference is between the following CVS tags found at: > > http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/cvs-tags.html: > > RELENG_4 > RELENG_4_10 > RELENG_4_10_0_RELEASE > I assume RELENG_4_10_0_RELEASE is what the sources were tagged as at > the time 4.10 was made an official release, True. > and then development toward 4.11 is made under the name RELENG_4. True. > If that's the case, then what is RELENG_4_10? The page says that > RELENG_4_10 is 'the release branch for FreeBSD-4.10, used only for > security advisories and other critical fixes.' Does this mean there > are two lines of development here? Well, yes and no. It means that people who want to stick to the 4.10-RELEASE version (marked, as you correctly wrote, by the RELENG_4_10_0_RELEASE tag) but still want to grab the latest security fixes from CVSup without having to install RELENG_4 (because, for instance, it might be already close to a newer release, like 4.12-RELEASE)... these people can use the RELENG_4_10 tag. The RELENG_4_10 tag gets you a different "branch" of the source tree, one that is updated only when there is a very good reason to do so. So then, yes... there *are* two lines of development. The difference between them is that the RELENG_4 branch receives only conservative updates to the system but RELENG_4_10 is even more conservative -- it only getscritical security fixes. Tested features of the kernel and userland, including new tools, new drivers, or anything else that is deemed stable enough for -STABLE STABLE (RELENG_4 is what we call "FreeBSD-STABLE" these days) can find their way into the RELENG_4 branch. Not all of them are eligible for inclusion into a "security branch" like RELENG_4_10. So, development does not, in fact, continue in RELENG_4_10. - Giorgos