From owner-freebsd-stable Thu Jun 27 21:36:27 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 C755837B405 for ; Thu, 27 Jun 2002 21:36:21 -0700 (PDT) Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by mx1.FreeBSD.org (Postfix) with ESMTP id 092CF43DF9 for ; Thu, 27 Jun 2002 21:36:21 -0700 (PDT) (envelope-from bmah@employees.org) Received: from bmah.dyndns.org ([12.233.149.189]) by rwcrmhc51.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020628043620.EKMQ9178.rwcrmhc51.attbi.com@bmah.dyndns.org>; Fri, 28 Jun 2002 04:36:20 +0000 Received: from intruder.bmah.org (localhost [IPv6:::1]) by bmah.dyndns.org (8.12.4/8.12.4) with ESMTP id g5S4aKPc036151; Thu, 27 Jun 2002 21:36:20 -0700 (PDT) (envelope-from bmah@intruder.bmah.org) Received: (from bmah@localhost) by intruder.bmah.org (8.12.4/8.12.4/Submit) id g5S4aEfW036150; Thu, 27 Jun 2002 21:36:14 -0700 (PDT) Message-Id: <200206280436.g5S4aEfW036150@intruder.bmah.org> X-Mailer: exmh version 2.5+ 20020506 with nmh-1.0.4 To: dnu@info.com.ph Cc: freebsd-stable@FreeBSD.ORG Subject: Re: releng_4 In-Reply-To: <200206281213.40498.dnu@info.com.ph> References: <200206281213.40498.dnu@info.com.ph> Comments: In-reply-to dnu message dated "Fri, 28 Jun 2002 12:13:40 +0800." From: "Bruce A. Mah" Reply-To: bmah@FreeBSD.ORG X-Face: g~c`.{#4q0"(V*b#g[i~rXgm*w;:nMfz%_RZLma)UgGN&=j`5vXoU^@n5v4:OO)c["!w)nD/!!~e4Sj7LiT'6*wZ83454H""lb{CC%T37O!!'S$S&D}sem7I[A 2V%N&+ X-Image-Url: http://www.employees.org/~bmah/Images/bmah-cisco-small.gif X-Url: http://www.employees.org/~bmah/ Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==_Exmh_1567570166P"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit Date: Thu, 27 Jun 2002 21:36:14 -0700 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --==_Exmh_1567570166P Content-Type: text/plain; charset=us-ascii If memory serves me right, dnu wrote: > 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? No. You either grab one or the other. > Or do > the updates to releng_4_6 also get to releng_4? Generally yes, although there may be cases where bugfixes may be applied in different ways. For example, in order to handle a security issue, RELENG_4 might receive an updated version of a program, where RELENG_4_6 might just get enough of a patch to fix whatever the problem was. > 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? Mostly right. I usually think of it the other way around...RELENG_4 is a development branch and any critical security bugfixes from that branch will be applied to RELENG_4_6, or whatever the applicable security fix branch is. Note that the release notes are not updated on the security bugfix branches (they remain the same as they were for the -RELEASE). See src/ UPDATING on a security fix branch for a list of changes that have been applied since the -RELEASE. (I know this should be in the release notes somewhere...it's on my TODO list.) Bruce. --==_Exmh_1567570166P Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (FreeBSD) Comment: Exmh version 2.5+ 20020506 iD8DBQE9G+e92MoxcVugUsMRAs5YAKCdvK0JPagTj7dIYxV72Ad/PR1WlwCeOwY2 XPLMkBwvhMRGTxl8BKeLz2w= =nwJF -----END PGP SIGNATURE----- --==_Exmh_1567570166P-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message