From owner-freebsd-hackers Tue Sep 30 23:04:56 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id XAA19805 for hackers-outgoing; Tue, 30 Sep 1997 23:04:56 -0700 (PDT) Received: from bob.scl.ameslab.gov (bob.scl.ameslab.gov [147.155.137.254]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id XAA19799 for ; Tue, 30 Sep 1997 23:04:51 -0700 (PDT) Received: from bob.scl.ameslab.gov (localhost [127.0.0.1]) by bob.scl.ameslab.gov (8.8.7/8.8.5) with ESMTP id BAA02252 for ; Wed, 1 Oct 1997 01:04:51 -0500 (CDT) Message-Id: <199710010604.BAA02252@bob.scl.ameslab.gov> To: freebsd-hackers@freebsd.org Subject: CVS and branches.. Date: Wed, 01 Oct 1997 01:04:51 -0500 From: Chris Csanady Sender: owner-freebsd-hackers@freebsd.org X-Loop: FreeBSD.org Precedence: bulk I have a very basic understanding of CVS, but I'm not exactly sure how branches fit into the whole thing. Basically, I want to create a branch of my own that I can work, while remaining current as well. How do I go about this? I was thinking that I would need a cvsup'd copy of the current repository, as well as a local one, and then keep them in sync. Then I would create a branch in my local repository, and periodically merge the current one in with it. In the end, I would like to produce diffs against current that would be suitable for inclusion. If this is fairly close to reality, could someone briefly explain how you actually accomplish this? (Perhaps even usesable cvs command syntax) Thanks, Chris Csanady