From owner-freebsd-stable  Thu Jun 27 21:41:51 2002
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D849437B400
	for <freebsd-stable@FreeBSD.ORG>; Thu, 27 Jun 2002 21:41:46 -0700 (PDT)
Received: from HAL9000.wox.org (12-233-156-170.client.attbi.com [12.233.156.170])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4C84343E01
	for <freebsd-stable@FreeBSD.ORG>; Thu, 27 Jun 2002 21:41:46 -0700 (PDT)
	(envelope-from das@HAL9000.wox.org)
Received: from HAL9000.wox.org (localhost [127.0.0.1])
	by HAL9000.wox.org (8.12.3/8.12.3) with ESMTP id g5S4g7NC005522;
	Thu, 27 Jun 2002 21:42:07 -0700 (PDT)
	(envelope-from das@HAL9000.wox.org)
Received: (from das@localhost)
	by HAL9000.wox.org (8.12.3/8.12.3/Submit) id g5S4g609005521;
	Thu, 27 Jun 2002 21:42:06 -0700 (PDT)
Date: Thu, 27 Jun 2002 21:42:05 -0700
From: David Schultz <dschultz@uclink.Berkeley.EDU>
To: dnu <dnu@info.com.ph>
Cc: freebsd-stable@FreeBSD.ORG
Subject: Re: releng_4
Message-ID: <20020627214205.A5449@HAL9000.wox.org>
Mail-Followup-To: dnu <dnu@info.com.ph>, freebsd-stable@FreeBSD.ORG
References: <200206281213.40498.dnu@info.com.ph>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200206281213.40498.dnu@info.com.ph>; from dnu@info.com.ph on Fri, Jun 28, 2002 at 12:13:40PM +0800
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG

Thus spake dnu <dnu@info.com.ph>:
> I was reading about cvsup in the handbook and I'm a bit confused.  
> It said that releng_4 is the main stable branch while releng_4_6 
> is for critical fixes.
> 
> So, if I cvs releng_4, do I also need to cvs releng_4_6?  Or do 
> the updates to releng_4_6 also get to releng_4?
> 
> Hmm... Correct me if I'm wrong.  Releng_4_6 is for critical fixes 
> to 4.6-release and whatever is updated there also gets to 
> releng_4 - a.k.a. 4.6-stable - am I right?

RELENG_4 and RELENG_4_6 are just tags on the same code repository.
Think of them as snapshots made at a particular time.  (That's not
quite true, but close enough.)  Regardless of which one you choose,
you will get all of the sources you need.  The only difference is that
RELENG_4 will give you sources that include all recent changes to the
-STABLE branch, and RELENG_4_6 will give you sources that include only
security-related changes since 4.6 was released.

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