Date: Thu, 12 Mar 1998 21:46:42 +0000 (GMT) From: Terry Lambert <tlambert@primenet.com> To: eivind@yes.no (Eivind Eklund) Cc: chuckr@glue.umd.edu, FreeBSD-current@FreeBSD.ORG Subject: Re: cvs question Message-ID: <199803122146.OAA19166@usr06.primenet.com> In-Reply-To: <19980312211122.46447@follo.net> from "Eivind Eklund" at Mar 12, 98 09:11:22 pm
next in thread | previous in thread | raw e-mail | index | archive | help
> On Thu, Mar 12, 1998 at 03:00:57PM -0500, Chuck Robey wrote: > > I've made modifications to a small part of my checked out src tree that > > I don't want cvs to reset on me when I do an update. I remember > > something about using a .cvsignore file, but I don't see anything like > > what I seem to recall in the man page. > > What do you mean 'reset'? CVS don't "reset" anything for, it just > display questionmarks saying that it doesn't know anything about those > files. He means CVSUP. I've had the same problem myself. Effectively, there's supposed to be two ways around this, but I'll be damned if I could get either one of them to ever work properly. Primus There is supposedly a branch tag called "LOCAL" that will be checked in "real soon now" (stated in June of 1996; hasn't happened yet). If you check changes in with this tag (guaranteed to never be used in the source tree, and therefore never updated), they are supposed to be able to live across a CVSUP. Secondus There is supposedly a "magic" revision ID that you can use on a local branch point that CVSUP won't touch. I've been told "1000" and "1001" and various other values, but I haven't seen a way for it to actually work. One real problem here is that you really want to CVSUP FreeBSD down to a local tree, as if you owned the local tree, and FreeBSD was on a continuously updated vendor branch. This would let you "merge to head" incrementally. For instance, I have a huge number of local changes, some of which have been committed to FreeBSD, and most of which haven't. I want to "merge to HEAD" for all the changes that *have* been committed, because they show as deltas in my local repository (if FreeBSD is actually a vendor-tagged branch). Terry Lambert terry@lambert.org --- Any opinions in this posting are my own and not those of my present or previous employers. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199803122146.OAA19166>