From owner-freebsd-questions Tue May 19 15:08:26 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id PAA28635 for freebsd-questions-outgoing; Tue, 19 May 1998 15:08:26 -0700 (PDT) (envelope-from owner-freebsd-questions@FreeBSD.ORG) Received: from dt050n33.san.rr.com (@dt053nd2.san.rr.com [204.210.34.210]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id PAA28546 for ; Tue, 19 May 1998 15:08:03 -0700 (PDT) (envelope-from Studded@dal.net) Received: from dal.net (Studded@localhost [127.0.0.1]) by dt050n33.san.rr.com (8.8.8/8.8.8) with ESMTP id PAA06137 for ; Tue, 19 May 1998 15:07:58 -0700 (PDT) (envelope-from Studded@dal.net) Message-ID: <356202BD.1BD5C7DA@dal.net> Date: Tue, 19 May 1998 15:07:57 -0700 From: Studded Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.05 [en] (X11; I; FreeBSD 2.2.6-STABLE-0507 i386) MIME-Version: 1.0 To: FreeBSD Questions Subject: Intermediate (?) level CVS questions Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Greetings, I have been using cvsup happily for about 8 months now to keep my local copies of source, doc and ports up to date. For various reasons I decided to take a stab at using a full FreeBSD CVS repository. I am familiar with the CVS basics like checking out files, making changes, committing the changes, etc. We use CVS for DALnet ircd development. However several of the specific reasons I want the full repository are giving me a massive headache. :) I've read everything I could find on CVS including the info file, www tutorials, FAQ, Handbook, quite a bit of the mail archives and of course the man pages. First question. I have successfully set up the CVS repository and used it to check out a full set of -Stable sources, however there are quite a few items that I don't build even during a make world so I would like to avoid checking them out to conserve disk space. I looked high and low for a setting that says "check out all of 'src' except the following" similar to the refuse file I use for cvsup but couldn't find it. I've basically come to the conclusion that such an option doesn't exist, which isn't the end of the world I suppose. I know I could make a script that checks out the individual elements that I want (in fact I did that for ports) but it would be more work than I want to keep that up to date for the src tree, and work is what I'm trying to avoid with CVS. :) Related to the first question, I have customized a lot of stuff in my make world setup. Almost all of these changes are related to parts of the system that I don't build, so we're essentially talking about a lot of modified makefiles, and a few things related to long usernames. What I'd like to do is set up a branch that has all of my stuff on it so when I check out the src tree I can merge my branch into the main branch. I am familiar with creating branches, however I ran into two problems. First, I edited one of the makefiles, tagged it, then tried 'cvs commit -r MYBRANCH Makefile'. I got an error message asking me to commit on freefall instead which I'm sure no one would want me to do even if I could. :) However I think this point is moot because I figured that every time I cvsup'ed the cvs tree it would delete my changes, and I was correct in that when I tested. What I suspect is that I need to create a whole new directory under /home/ncvs for things like this, but I'm befuddled on exactly how to do that from things checked out to /usr/src. I'd also like to do something similar here with things like CAM. This is one area where I could use some specific, detailed help or pointers to the same. :-/ The next problem I'm having is using the rdiff command. One of the main reasons I want the full CVS repository on hand is to take a look at the changes between 2.2.5 and 2.2.6 and see if I can find the cause of some performance problems one of my customers is having since the upgrade. When I do: cvs rdiff -kk -r RELENG_2_2 -r HEAD src I get a nice fat diff file and all kinds of little updates on the screen telling me where cvs is diff'ing. However when I do: cvs rdiff -kk -r RELENG_2_2_5_RELEASE -r RELENG_2_2_6_RELEASE src I get bupkis. Nothing but a grinding disk and no output at all. I've double checked the tag names but still can't figure out where I'm going wrong. I'm sure that these will seem simplistic questions to the CVS veterans, however it would be a big help to me to get them answered. :) Thanks, Doug -- *** Chief Operations Officer, DALnet IRC network *** *** Proud designer and maintainer of the world's largest Internet *** Relay Chat server with 5,328 simultaneous connections. *** Try spider.dal.net on ports 6662-4 (Powered by FreeBSD) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message