Date: Tue, 07 Dec 1999 18:24:47 +0200 From: Sheldon Hearn <sheldonh@uunet.co.za> To: Jonathon McKitrick <jcm@dogma.freebsd-uk.eu.org> Cc: freebsd-questions@FreeBSD.ORG Subject: Re: changing source before make world Message-ID: <11102.944583887@axl.noc.iafrica.com> In-Reply-To: Your message of "Tue, 07 Dec 1999 16:19:44 GMT." <Pine.BSF.4.02A.9912071617590.29541-100000@dogma.freebsd-uk.eu.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?11102.944583887>