From owner-freebsd-questions@FreeBSD.ORG  Fri Feb  1 13:11:52 2008
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7E45216A468
	for <freebsd-questions@freebsd.org>;
	Fri,  1 Feb 2008 13:11:52 +0000 (UTC)
	(envelope-from mail25@bzerk.org)
Received: from ei.bzerk.org (ei.bzerk.org [82.95.223.12])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E2F913C4E3
	for <freebsd-questions@freebsd.org>;
	Fri,  1 Feb 2008 13:11:51 +0000 (UTC)
	(envelope-from mail25@bzerk.org)
Received: from ei.bzerk.org (BOFH@localhost [127.0.0.1])
	by ei.bzerk.org (8.13.8/8.13.8) with ESMTP id m11DChWv035342;
	Fri, 1 Feb 2008 14:12:43 +0100 (CET) (envelope-from mail25@bzerk.org)
Received: (from bulk@localhost)
	by ei.bzerk.org (8.13.8/8.13.8/Submit) id m11DChRb035341;
	Fri, 1 Feb 2008 14:12:43 +0100 (CET) (envelope-from mail25@bzerk.org)
Date: Fri, 1 Feb 2008 14:12:43 +0100
From: Ruben de Groot <mail25@bzerk.org>
To: Chris <racerx@makeworld.com>
Message-ID: <20080201131243.GA35255@ei.bzerk.org>
Mail-Followup-To: Ruben de Groot <mail25@bzerk.org>,
	Chris <racerx@makeworld.com>, Allen <doomnix@comcast.net>,
	freebsd-questions@freebsd.org
References: <1201823233.15358.40.camel@Caffiend.org>
	<20080131195749.0b6f551d@makeworld.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20080131195749.0b6f551d@makeworld.com>
User-Agent: Mutt/1.4.2.3i
X-Spam-Status: No, score=-4.0 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00,
	J_CHICKENPOX_44 autolearn=no version=3.2.1
X-Spam-Checker-Version: SpamAssassin 3.2.1 (2007-05-02) on ei.bzerk.org
Cc: Allen <doomnix@comcast.net>, freebsd-questions@freebsd.org
Subject: Re: CVSup update or upgrade
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Feb 2008 13:11:52 -0000

On Thu, Jan 31, 2008 at 07:57:49PM -0600, Chris typed:

> NOTE: I don't use mergemaster unless I go from say 6.3 to 7.0

Not wise. New features and fixes are applied to configuration files and
rc scripts regu;arly. You'll probably miss them.

> STABLE is the security fix branch.

Wrong. According to the handbook:

23.2.2.1 What Is FreeBSD-STABLE?
FreeBSD-STABLE is our development branch from which major releases are 
made. Changes go into this branch at a different pace, and with the general
assumption that they have first gone into FreeBSD-CURRENT for testing. This 
is still a development branch, however, and this means that at any given 
time, the sources for FreeBSD-STABLE may or may not be suitable for any 
particular purpose. It is simply another engineering development track, not 
a resource for end-users.

RELENG_6 is STABLE
RELENG_6_3 is for security fixes

regards,
Ruben