From owner-freebsd-questions Tue Dec 7 8:29:44 1999 Delivered-To: freebsd-questions@freebsd.org Received: from serenity.mcc.ac.uk (serenity.mcc.ac.uk [130.88.200.93]) by hub.freebsd.org (Postfix) with ESMTP id 2154914A0E for ; Tue, 7 Dec 1999 08:29:41 -0800 (PST) (envelope-from jcm@dogma.freebsd-uk.eu.org) Received: from dogma.freebsd-uk.eu.org ([130.88.200.97]) by serenity.mcc.ac.uk with esmtp (Exim 1.92 #3) id 11vNUi-000F6t-00; Tue, 7 Dec 1999 16:29:40 +0000 Received: from localhost (jcm@localhost) by dogma.freebsd-uk.eu.org (8.9.3/8.9.3) with SMTP id QAA30132; Tue, 7 Dec 1999 16:29:40 GMT (envelope-from jcm@dogma.freebsd-uk.eu.org) Date: Tue, 7 Dec 1999 16:29:40 +0000 (GMT) From: Jonathon McKitrick To: Sheldon Hearn Cc: freebsd-questions@FreeBSD.ORG Subject: Re: changing source before make world In-Reply-To: <11102.944583887@axl.noc.iafrica.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Tue, 7 Dec 1999, Sheldon Hearn wrote: >No. One cool thing about CVS is that it tries to deal gracefully with >local modifications to your checked out source when it has to apply >deltas from the repository -- which is _exactly_ what you're looking >for. Sounds like it is. Now, is there an easy way to do this *only* for this file? I already have nice little scripts set up to do my cvsup upgrades, and i don't think it makes sense to change everything now.. unless.. i'm ready to move to the next level. But i don't have a lot of space or bandwidth to spare. Do you mean i can just run CVS separately on that module? How do i single out just the pccardd target? > >If the delta from the repo overlaps with a local modification you've >made to the file, a CVS conflict occurs. The file is modified for your >attention. It's up to you to resolve the conflict, which is usually >easy. > >When a CVS conflict occurs, CVS complains about it. So as long as >you're saving the output of your CVS runs, you'll always know about >conflicts. > >Ciao, >Sheldon. > -jm ------------------ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message