Date: Mon, 22 Dec 1997 22:56:35 -0800 (PST) From: Doug White <dwhite@gdi.uoregon.edu> To: David K Phinney <dphinney@dowco.com> Cc: questions@FreeBSD.ORG Subject: Re: Local edits and CVS Message-ID: <Pine.BSF.3.96.971222225606.7705I-100000@localhost> In-Reply-To: <199712190148.RAA13968@lithium.dowco.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 18 Dec 1997, David K Phinney wrote: > Hello, > > What's the best method for keeping local edits to FreeBSD source files > across CVSups? I've just added quotas to mail.local (using a db database, > if you're interested). Is there some way I can have any future CVSup > edits to mail.local integrated with my changes without my intervention? Put them on a separate branch. You can use CVS's merging features to bring the branches together when you checkout. Doug White | University of Oregon Internet: dwhite@resnet.uoregon.edu | Residence Networking Assistant http://gladstone.uoregon.edu/~dwhite | Computer Science Major
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.3.96.971222225606.7705I-100000>