From owner-freebsd-questions Tue Dec 7 8:25:14 1999 Delivered-To: freebsd-questions@freebsd.org Received: from axl.noc.iafrica.com (axl.noc.iafrica.com [196.31.1.175]) by hub.freebsd.org (Postfix) with ESMTP id 1725114D9C for ; Tue, 7 Dec 1999 08:25:07 -0800 (PST) (envelope-from sheldonh@axl.noc.iafrica.com) Received: from sheldonh (helo=axl.noc.iafrica.com) by axl.noc.iafrica.com with local-esmtp (Exim 3.11 #1) id 11vNPz-0002t5-00; Tue, 07 Dec 1999 18:24:47 +0200 From: Sheldon Hearn To: Jonathon McKitrick Cc: freebsd-questions@FreeBSD.ORG Subject: Re: changing source before make world In-reply-to: Your message of "Tue, 07 Dec 1999 16:19:44 GMT." Date: Tue, 07 Dec 1999 18:24:47 +0200 Message-ID: <11102.944583887@axl.noc.iafrica.com> Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Tue, 07 Dec 1999 16:19:44 GMT, Jonathon McKitrick wrote: > Are you basically implying that i create a CVS/RCS delta that is > applied to the file each time i compile it? 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. 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. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message