From owner-freebsd-questions  Thu Dec 18 17:49:19 1997
Return-Path: <owner-freebsd-questions>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id RAA10804
          for questions-outgoing; Thu, 18 Dec 1997 17:49:19 -0800 (PST)
          (envelope-from owner-freebsd-questions)
Received: from lithium.dowco.com (lithium.dowco.com [207.23.88.22])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id RAA10797
          for <questions@FreeBSD.ORG>; Thu, 18 Dec 1997 17:49:14 -0800 (PST)
          (envelope-from dphinney@dowco.com)
Received: (from dphinney@localhost)
	by lithium.dowco.com (8.8.7/8.8.7/CF.6) id RAA13968
	for questions@FreeBSD.ORG; Thu, 18 Dec 1997 17:48:59 -0800 (PST)
From: David K Phinney <dphinney@dowco.com>
Message-Id: <199712190148.RAA13968@lithium.dowco.com>
Subject: Local edits and CVS
To: questions@FreeBSD.ORG
Date: Thu, 18 Dec 1997 17:48:58 -0800 (PST)
X-PGP-Key-Url: http://www.dowco.com/~dphinney/pgpkey.txt
X-Mailer: ELM [version 2.4ME+ PL22 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-questions@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

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?

Right now I have it under /usr/src/local/libexec/mail.local/, but I
would have to apply the patches myself if I did a CVSup (and i guess my
/usr/libexec/mail.local would be replaced with the stock one if I did
a `make world').

Any suggestions appreciated! (That *is* why I'm writing...)


--dave
David K. Phinney
Systems/Network Manager                                 (604) 606-5728
dowco.com internet                                      dave@dowco.com