Date: Tue, 30 Mar 1999 17:38:12 -0800 From: Aaron Smith <aaron-fbsd@arctic.org> To: chad@dcfinc.com Cc: stable@FreeBSD.ORG Subject: Re: preserving local mods Message-ID: <199903310138.RAA11902@sigma.veritas.com> In-Reply-To: Your message of "Tue, 30 Mar 1999 18:30:36 MST." <199903310130.SAA24757@freebie.dcfinc.com>
next in thread | previous in thread | raw e-mail | index | archive | help
as you guess in your last sentence, you can avoid this by cvsupping a CVS tree instead of the actual sources, and using "cvs update" to update your sources. this way you can have local mods merged, and occasionally you have to resolve conflicts. it's a lot easier than what you describe, in my opinion. that's what i do, anyway. i don't actually check in my changes -- if i ever want to blow away my sources i save a "cvs diff" and i can re-apply them easily. aaron On Tue, 30 Mar 1999 18:30:36 MST, "Chad R. Larson" writes: >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? > > -crl To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199903310138.RAA11902>