From owner-freebsd-hackers Thu Feb 29 07:32:43 1996 Return-Path: owner-hackers Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id HAA17370 for hackers-outgoing; Thu, 29 Feb 1996 07:32:43 -0800 (PST) Received: from rocky.sri.MT.net (rocky.sri.MT.net [204.182.243.10]) by freefall.freebsd.org (8.7.3/8.7.3) with SMTP id HAA17355 for ; Thu, 29 Feb 1996 07:32:29 -0800 (PST) Received: (from nate@localhost) by rocky.sri.MT.net (8.6.12/8.6.12) id IAA11404; Thu, 29 Feb 1996 08:35:09 -0700 Date: Thu, 29 Feb 1996 08:35:09 -0700 From: Nate Williams Message-Id: <199602291535.IAA11404@rocky.sri.MT.net> To: Peter Dufault Cc: hackers@freebsd.org Subject: Re: How to use the sup'd CVS tree? In-Reply-To: <199602291251.HAA11962@hda.com> References: <199602291251.HAA11962@hda.com> Sender: owner-hackers@freebsd.org Precedence: bulk > I have now sup'd the cvs tree and have what looks like the -current > release, and I can do "cvs gets", etc, locally. But I don't > understand the process for working in -current and getting patches > for -stable for local test. The easiest way is to checkout two trees on your local box of the stuff you're working on, one for -current and one for -stable. (There are other ways to do this, but I find this to work the best.) > 0. (Basic assertion I think is correct) There is no "cvs awareness" > in sup, and sup will simply update my sup tree to match what is on freefall. SUP simply makes sure the 'bits' are the same at both ends. Nothing more, nothing less. > 1. How do I "sup" again? I assume most info is kept in the local > working directory, so if all I have is locally checked out modules > I can go ahead and "sup cvs" when I want, and it is only when I > want to commit my changes that I have to be careful. You can 'sup' all day long all the time and it won't matter 'as long as you don't commit your changes locally'. This is a bad thing, since those changes will go over-written as soon as you re-sup. So, the moral of the story is to *never* commit locally. > 2. Do I commit back on freefall and then get my updates in the next > sup? That's pretty much how folks (modulo some stuff Peter's doing) are doing things now. That might change in the near future, but I'll let Peter spear-head that. > 3. How do I do local revision control, in conjunction with question > 1? If I'm doing extensive work can I create a local branch so that > I can keep local changes under revision control without having > "sup" step on me? Nope. If you want to do local revision control, your best bet is to is to use a non-shared (ie; local) CVS tree, and keep it up to date locally. Either that or create a branch tree on freefall and do your commits there away from the world. This still requires that all of your commits be done on freefall. > I don't see how this would play with assertion 0 without creating > branches back on freefall. You've got it. > D. Where is -stable? Is it a branch somewhere in what I got in > "sup cvs"? The branch tag is 'RELENG_2_1_0'. So, to checkout a stable tree you would do: # cvs co -r RELENG_2_1_0 module to update: # cvs update -Pdr RELENG_2_1_0 module [ If you've got sticky tags you don't need the release tag, but I always use it just in case. ] For -current: # cvs co module to update: # cvs update -PdA module [ Again, the -A is un-needed but it clears out any sticky tags and guarantees you've got -current bits ] > 5. Am I on the right track? Yep. Nate