Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 May 1998 15:04:09 -0400
From:      Brian Cully <shmit@kublai.com>
To:        Studded <Studded@san.rr.com>, freebsd-hackers@FreeBSD.ORG
Subject:   Re: [Fwd: Intermediate (?) level CVS questions]
Message-ID:  <19980526150409.30903@kublai.com>
In-Reply-To: <356485A5.8022EEE2@san.rr.com>; from Studded on Thu, May 21, 1998 at 12:51:01PM -0700
References:  <356485A5.8022EEE2@san.rr.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, May 21, 1998 at 12:51:01PM -0700, Studded wrote:
> 	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. :)

There's no easy way to do this.

> 	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.

You cannot branch with CVSup. Even if you could convince cvs to check
the changes in, CVSup will happily clobber them when it's next run.

FWIW, I think Terry's also keen on CVSup branching, so you might be
able to convince John that it's worth his time to pursue.

I don't particularly care myself, since I don't do test that much
stuff at the same time, and if I do, I just check out two different
trees.

> 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. 

cvs rdiff -r RELENG_2_2_5_RELEASE -r RELENG_2_2_6_RELEASE freebsd-src

worked just fine for me. :-/

-- 
Brian Cully						<shmit@erols.com>
``And when one of our comrades was taken prisoner, blindfolded, hung
  upside-down, shot, and burned, we thought to ourselves, `These are the
  best experiences of our lives''' -Pathology (Joe Frank, Somewhere Out There)

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19980526150409.30903>