From owner-freebsd-questions Mon Dec 22 22:56:54 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id WAA13985 for questions-outgoing; Mon, 22 Dec 1997 22:56:54 -0800 (PST) (envelope-from owner-freebsd-questions) Received: from gdi.uoregon.edu (cisco-ts7-line16.uoregon.edu [128.223.150.63]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id WAA13974 for ; Mon, 22 Dec 1997 22:56:49 -0800 (PST) (envelope-from dwhite@gdi.uoregon.edu) Received: from localhost (dwhite@localhost) by gdi.uoregon.edu (8.8.7/8.8.8) with SMTP id WAA08030; Mon, 22 Dec 1997 22:56:35 -0800 (PST) (envelope-from dwhite@gdi.uoregon.edu) Date: Mon, 22 Dec 1997 22:56:35 -0800 (PST) From: Doug White X-Sender: dwhite@localhost Reply-To: Doug White To: David K Phinney cc: questions@FreeBSD.ORG Subject: Re: Local edits and CVS In-Reply-To: <199712190148.RAA13968@lithium.dowco.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-questions@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk 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