From owner-freebsd-questions@FreeBSD.ORG Sun May 6 19:05:43 2007 Return-Path: X-Original-To: freebsd-questions@freebsd.org Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8D89516A543 for ; Sun, 6 May 2007 19:05:43 +0000 (UTC) (envelope-from corwin@aeternal.net) Received: from amber.aeternal.net (amber.aeternal.net [212.232.17.148]) by mx1.freebsd.org (Postfix) with ESMTP id 1C35F13C480 for ; Sun, 6 May 2007 19:05:43 +0000 (UTC) (envelope-from corwin@aeternal.net) Received: from localhost (localhost.aeternal.net [127.0.0.1]) by amber.aeternal.net (Postfix) with ESMTP id 81D42B821 for ; Sun, 6 May 2007 21:05:39 +0200 (CEST) X-Virus-Scanned: by amavisd-new at aeternal.net Received: from amber.aeternal.net ([127.0.0.1]) by localhost (amber.aeternal.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Aw-BGz6gIX1b for ; Sun, 6 May 2007 21:05:38 +0200 (CEST) Received: from [127.0.0.1] (chello085216248040.chello.sk [85.216.248.40]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: corwin@aeternal.net) by amber.aeternal.net (Postfix) with ESMTP id 95E10B81D for ; Sun, 6 May 2007 21:05:38 +0200 (CEST) Message-ID: <463E26FF.8030507@aeternal.net> Date: Sun, 06 May 2007 21:05:35 +0200 From: Martin Hudec User-Agent: Thunderbird 2.0.0.0 (Windows/20070326) MIME-Version: 1.0 To: 'FreeBSD Questions' References: <2AD6FC99-694F-4633-8945-771CFA7B35EA@goldmark.org> In-Reply-To: <2AD6FC99-694F-4633-8945-771CFA7B35EA@goldmark.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: CVS release tag for current patched release X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: corwin@aeternal.net List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2007 19:05:43 -0000 Jeffrey Goldberg wrote: > The short version of my question is whether the cvs tag RELENG_6_2 > refers to the latest on the 6.2 STABLE branch or the 6.2 RELEASE Branch. RELENG_6 - actual -STABLE RELENG_6_2 - actual -RELEASE-pX -RELEASE are taken off -STABLE at predefined times, and as such we can say, that -RELEASE is snapshot from -STABLE at the date of new release. Development is being done in -STABLE. So if you want to have current release with it's patchlevels as they are, use RELENG_6_2. > I wish to make some minor local modifications to my system running 6.2 > RELEASE p4. So far, I've been maintaining my system using csup with a > sup file based on > > /usr/share/examples/cvsup/standard-supfile > > But my local changes get overwritten with each new update using csup. I > was advised earlier on this list to use cvs instead (which I thought > csup did, but now I see that csup (and cvsup) will use "checkout" mode > instead of "CVS mode" unless I'm on the bleeding edge. Copy this file somewhere else, like /usr/local/etc and modify it as you need. Whole cvsup command would look like: # cvsup -L 2 /usr/local/etc/stable-supfile kind regards, Martin