From owner-freebsd-stable Tue Mar 30 17:45:57 1999 Delivered-To: freebsd-stable@freebsd.org Received: from wall.polstra.com (rtrwan160.accessone.com [206.213.115.74]) by hub.freebsd.org (Postfix) with ESMTP id 1E8EF14BF9 for ; Tue, 30 Mar 1999 17:45:55 -0800 (PST) (envelope-from jdp@polstra.com) Received: from vashon.polstra.com (vashon.polstra.com [206.213.73.13]) by wall.polstra.com (8.9.1/8.9.1) with ESMTP id RAA03992; Tue, 30 Mar 1999 17:45:29 -0800 (PST) (envelope-from jdp@polstra.com) From: John Polstra Received: (from jdp@localhost) by vashon.polstra.com (8.9.2/8.9.1) id RAA18675; Tue, 30 Mar 1999 17:45:28 -0800 (PST) (envelope-from jdp@polstra.com) Date: Tue, 30 Mar 1999 17:45:28 -0800 (PST) Message-Id: <199903310145.RAA18675@vashon.polstra.com> To: chad@dcfinc.com Subject: Re: preserving local mods In-Reply-To: <199903310130.SAA24757@freebie.dcfinc.com> Organization: Polstra & Co., Seattle, WA Cc: stable@freebsd.org Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG In article <199903310130.SAA24757@freebie.dcfinc.com>, Chad R. Larson wrote: > This should probably be a FAQ. > > What is the recommended method for preserving local edits in the > source tree? > > For example, I changed "/usr/src/lkm/syscons/snake/snake_saver.c" > to make the crawling banner identify the machine and it's use. > Keeps the operators amused and is better than a PostIt note. But now, > each time I CVSup, I have to remember to check out my modified version > from the RCS file I created as part of the edit process. > > Enough folks must have this issue that there should be a process. > How do y'all deal with it? Create a ".cvsignore" file in the > directory? Keep your own CVS repository and check in your changes > there? You can prevent CVSup from touching selected files by creating a "refuse" file. See cvsup(1) for details. Or CVSup the CVS repository and just keep your local changes checked out in your source tree. "cvs upd" will merge them as it goes. John -- John Polstra jdp@polstra.com John D. Polstra & Co., Inc. Seattle, Washington USA "Self-interest is the aphrodisiac of belief." -- James V. DeLong To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message