From owner-freebsd-questions@FreeBSD.ORG Sun May 6 18:40:35 2007 Return-Path: X-Original-To: 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 0981216A404 for ; Sun, 6 May 2007 18:40:35 +0000 (UTC) (envelope-from jeffrey@goldmark.org) Received: from out1.smtp.messagingengine.com (out1.smtp.messagingengine.com [66.111.4.25]) by mx1.freebsd.org (Postfix) with ESMTP id BCAD713C45D for ; Sun, 6 May 2007 18:40:34 +0000 (UTC) (envelope-from jeffrey@goldmark.org) Received: from compute1.internal (compute1.internal [10.202.2.41]) by out1.messagingengine.com (Postfix) with ESMTP id 6AD7621E808 for ; Sun, 6 May 2007 14:41:17 -0400 (EDT) Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by compute1.internal (MEProxy); Sun, 06 May 2007 14:40:35 -0400 X-Sasl-enc: 1OqNOP/ZMSiVfgQzM+kYnbo/3r/DYzZwHH13i5Pjzogn 1178476834 Received: from [10.1.10.136] (n114.ewd.goldmark.org [72.64.118.114]) by mail.messagingengine.com (Postfix) with ESMTP id D99A81AF49 for ; Sun, 6 May 2007 14:40:34 -0400 (EDT) Mime-Version: 1.0 (Apple Message framework v752.2) Content-Transfer-Encoding: quoted-printable Message-Id: <2AD6FC99-694F-4633-8945-771CFA7B35EA@goldmark.org> Content-Type: text/plain; charset=WINDOWS-1252; delsp=yes; format=flowed To: questions@freebsd.org From: Jeffrey Goldberg Date: Sun, 6 May 2007 13:40:32 -0500 X-Mailer: Apple Mail (2.752.2) Cc: Subject: CVS release tag for current patched release X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2007 18:40:35 -0000 The short version of my question is whether the cvs tag RELENG_6_2 =20 refers to the latest on the 6.2 STABLE branch or the 6.2 RELEASE Branch. The background (somewhat long winded) to the question and why I'm =20 confused follows. I wish to make some minor local modifications to my system running =20 6.2 RELEASE p4. So far, I've been maintaining my system using csup =20 with a sup file based on /usr/share/examples/cvsup/standard-supfile But my local changes get overwritten with each new update using =20 csup. I was advised earlier on this list to use cvs instead (which I =20= thought csup did, but now I see that csup (and cvsup) will use =20 "checkout" mode instead of "CVS mode" unless I'm on the bleeding edge. So, if I understand things correctly, I should be using cvs directly =20 and using "update" instead of "checkout" so that my local changes =20 will be merged locally with what is in the repository. I've been using rcs (and even sccs) for as long as I can remember, =20 but only in the most primitive of ways (I never used nor grokked =20 branches, although "Open Source Development with CVS: Learn How to =20 Work With Open Source Software" (ISBN 1576104907), which has been on =20 my shelves for years about I just started reading last night, has =20 been a great help). Now my impression from looking at the standard-supfile is that if I do a cvs update -r RELENG_6_2 I'll get what I need (the latest fix of the 6.2 release). However =20 there is a bit in the handbook that suggests that RELENG_6_2 will get =20= me the latest in the STABLE branch instead of RELEASE branch. From http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/=20 anoncvs.html Example A-3. Checking Out the Version of ls(1) in the 6-STABLE Branch: % setenv CVSROOT :pserver:anoncvs@anoncvs.jp.FreeBSD.org:/home/ncvs % cvs login At the prompt, enter the password =93anoncvs=94. % cvs co -rRELENG_6 ls That suggests that -r RELENG_6 will get the latest on the *STABLE* =20 branch. Is that an error in the docs, an error in my understanding, =20 or something else altogether. Finally it might help me if I knew where the term "RELENG" came =20 from. Things like "RELEASE", "CURRENT" and "STABLE" all make sense, =20 but "RELENG" doesn't seem to have some human meaning (well, not to =20 this human at least). Cheers, -j --=20 Jeffrey Goldberg http://www.goldmark.org/jeff/