CVS release tag for current patched release
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. The background (somewhat long winded) to the question and why I'm confused follows. 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. So, if I understand things correctly, I should be using cvs directly and using update instead of checkout so that my local changes 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, but only in the most primitive of ways (I never used nor grokked branches, although Open Source Development with CVS: Learn How to Work With Open Source Software (ISBN 1576104907), which has been on my shelves for years about I just started reading last night, has 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 there is a bit in the handbook that suggests that RELENG_6_2 will get me the latest in the STABLE branch instead of RELEASE branch. From http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ anoncvs.html Example A-3. Checking Out the Version of ls(1) in the 6-STABLE Branch: % setenv CVSROOT :pserver:[EMAIL PROTECTED]:/home/ncvs % cvs login At the prompt, enter the password “anoncvs”. % cvs co -rRELENG_6 ls That suggests that -r RELENG_6 will get the latest on the *STABLE* branch. Is that an error in the docs, an error in my understanding, or something else altogether. Finally it might help me if I knew where the term RELENG came from. Things like RELEASE, CURRENT and STABLE all make sense, but RELENG doesn't seem to have some human meaning (well, not to this human at least). Cheers, -j -- Jeffrey Goldberghttp://www.goldmark.org/jeff/ ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: CVS release tag for current patched release
On Sun, May 06, 2007 at 01:40:32PM -0500, 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. It refers to the latest on the 6.2-RELEASE branch. To get the latest from the 6-STABLE branch use the RELENG_6 tag. (There is not really any 6.2-STABLE branch, just a 6-STABLE branch from which all the 6.x releases get branched off. The term 6.2-STABLE just means: The 6-STABLE branch at any point in time after 6.2-RELEASE but before 6.3-RELEASE) The background (somewhat long winded) to the question and why I'm confused follows. [snip] Finally it might help me if I knew where the term RELENG came from. Things like RELEASE, CURRENT and STABLE all make sense, but RELENG doesn't seem to have some human meaning (well, not to this human at least). I believe RELENG is short for RELease ENGineering. -- Insert your favourite quote here. Erik Trulsson [EMAIL PROTECTED] ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: CVS release tag for current patched release
On Sun, May 06, 2007 at 08:50:16PM +0200, Erik Trulsson wrote: (There is not really any 6.2-STABLE branch, RELENG_6_2 is the name of the branch which is used to develop 6.2 on. It was branched from RELENG_6 (which in turn was branched from the main branch) just before the release of 6.2. It was used to transmogrify 6-STABLE into 6.2-RC1 into -RC2 into -RELEASE into -RELEASE-p1 and so on up to -RELEASE-p7. See http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/conf/newvers.sh?only_with_tag=RELENG_6_2 for some commentry. I think that's what the OP was looking for. -- Shenanigans! Shenanigans!Best of 3! -- Flash ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: CVS release tag for current patched release
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 ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
