From owner-freebsd-questions@FreeBSD.ORG Thu Jul 8 02:06:02 2004 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D95C116A4CE for ; Thu, 8 Jul 2004 02:06:02 +0000 (GMT) Received: from av7-1-sn2.hy.skanova.net (av7-1-sn2.hy.skanova.net [81.228.8.108]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEBFB43D39 for ; Thu, 8 Jul 2004 02:06:01 +0000 (GMT) (envelope-from ertr1013@student.uu.se) Received: by av7-1-sn2.hy.skanova.net (Postfix, from userid 502) id 791E537E47; Thu, 8 Jul 2004 04:06:00 +0200 (CEST) Received: from smtp2-2-sn2.hy.skanova.net (smtp2-2-sn2.hy.skanova.net [81.228.8.178]) by av7-1-sn2.hy.skanova.net (Postfix) with ESMTP id 69D0B37E42 for ; Thu, 8 Jul 2004 04:06:00 +0200 (CEST) Received: from falcon.midgard.homeip.net (h201n1fls24o1048.bredband.comhem.se [212.181.162.201]) by smtp2-2-sn2.hy.skanova.net (Postfix) with SMTP id 4D03F37E43 for ; Thu, 8 Jul 2004 04:05:59 +0200 (CEST) Received: (qmail 38560 invoked by uid 1001); 8 Jul 2004 02:05:59 -0000 Date: Thu, 8 Jul 2004 04:05:59 +0200 From: Erik Trulsson To: Rickard =?iso-8859-1?Q?Borgm=E4ster?= Message-ID: <20040708020559.GA38515@falcon.midgard.homeip.net> Mail-Followup-To: Rickard =?iso-8859-1?Q?Borgm=E4ster?= , freebsd-questions@freebsd.org References: <20040708025415.V98023@studsboll.realworld.nu> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20040708025415.V98023@studsboll.realworld.nu> User-Agent: Mutt/1.5.6i cc: freebsd-questions@freebsd.org Subject: Re: Which branch to use as tag for 5.2.1? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jul 2004 02:06:03 -0000 On Thu, Jul 08, 2004 at 03:01:11AM +0200, Rickard Borgm=E4ster wrote: > Hi, >=20 > I'm trying out FBSD 5.2.1 at the moment to see if it will work OK with my > onboard VIA 8237 SATA Controller, which didn't work that fine in 4.10. >=20 > I'm about to do a buildworld. But I have a little difficult understanding > what tag to set in my cvsupfile? I want something similar to RELENG_4 but > for 5.x. Ie, the latest "release" with fixes applied. Which branch is > that? >=20 > Browsing CVSweb I find these: > * RELENG_5_2_BP > * RELENG_5_2_1_RELEASE > * RELENG_5_2_0_RELEASE > * RELENG_5_2 > * RELENG_5_1_BP > * RELENG_5_1_0_RELEASE > * RELENG_5_1 > * RELENG_5_0_BP > * RELENG_5_0_0_RELEASE > * RELENG_5_0 >=20 > I don't want CURRENT, so it has to be one of these, I suppose. But I can't > find anything on the net that tells me exactly what each branch is. What you want is RELENG_5, which doesn't exist yet. It will be created when 5.x is considered to be the new -STABLE. Until then you can either follow -CURRENT (which is the "branch" leading up to the next 5.x release just as RELENG_4 is the branch leading up to the next 4.x release) or RELENG_5_2 (which is 5.2.1-RELEASE + important bugfixes) As for what the other tags are: RELENG_5_1 and RELENG_5_0 are as RELENG_5_2 except for 5.1-release and 5.0-release respectively - little reason to use them. The RELENG_5_x_BP tags are branches but static tags marking the place where the RELENG_5_x branch was created from HEAD. RELENG_5_x_y_RELEASE marks the code for 5.x.y-release, and also doesn't change. There is little reason to use either of those unless you for some reason want the exact code that went into a relase. --=20 Erik Trulsson ertr1013@student.uu.se