Date: Sun, 6 May 2007 13:40:32 -0500 From: Jeffrey Goldberg <jeffrey@goldmark.org> To: questions@freebsd.org Subject: CVS release tag for current patched release Message-ID: <2AD6FC99-694F-4633-8945-771CFA7B35EA@goldmark.org>
next in thread | raw e-mail | index | archive | help
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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2AD6FC99-694F-4633-8945-771CFA7B35EA>