From owner-freebsd-questions Thu Nov 22 6:43:39 2001 Delivered-To: freebsd-questions@freebsd.org Received: from mailg.telia.com (mailg.telia.com [194.22.194.26]) by hub.freebsd.org (Postfix) with ESMTP id AFB2437B405 for ; Thu, 22 Nov 2001 06:43:28 -0800 (PST) Received: from d1o913.telia.com (d1o913.telia.com [195.252.44.241]) by mailg.telia.com (8.11.6/8.11.6) with ESMTP id fAMEhQk04512 for ; Thu, 22 Nov 2001 15:43:26 +0100 (CET) Received: from ertr1013.student.uu.se (h185n2fls20o913.telia.com [212.181.163.185]) by d1o913.telia.com (8.8.8/8.8.8) with SMTP id PAA23795 for ; Thu, 22 Nov 2001 15:43:24 +0100 (CET) Received: (qmail 14225 invoked by uid 1001); 22 Nov 2001 14:43:19 -0000 Date: Thu, 22 Nov 2001 15:43:18 +0100 From: Erik Trulsson To: Anthony Atkielski Cc: FreeBSD Questions Subject: Re: Changing source code and rebuilding kernel -- how do I maintain my changes? Message-ID: <20011122144316.GA13807@student.uu.se> Mail-Followup-To: Anthony Atkielski , FreeBSD Questions References: <01e801c17350$4677f890$0a00000a@atkielski.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <01e801c17350$4677f890$0a00000a@atkielski.com> User-Agent: Mutt/1.3.23.2i Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, Nov 22, 2001 at 01:21:50PM +0100, Anthony Atkielski wrote: > In order to remove a diagnostic message, I need to change one line of if_xlreg.h > in the source code. What is the proper procedure for changing the file and > maintaining the change should the source code be updated? For the moment, I > just copied the original source to if_xlreg.h.old in the same directory, then > made my change, with a comment that I can grep if I need to find it in future. > Is this a good way to do it? What happens when I refresh all the source with > more recent versions? The easiest way to handle things like this is to use cvsup to maintain a local copy of the CVS repository. Then use cvs to update you source tree from your local repository. Cvs will not overwrite your local changes even if that file is modified in the repository but rather try to merge in your modifications in the new file. This way you also don't need to keep an extra copy of the file since you can always check out a fresh copy of the original file from the repository if necessary. The downside of this is that you will need a local copy of the repository which currently consumes about 1.3GB of disk space. (You could use anonymous cvs to update from a remote repository but that is fairly slow.) -- Erik Trulsson ertr1013@student.uu.se To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message