From owner-freebsd-stable Mon May 31 21:18:25 1999 Delivered-To: freebsd-stable@freebsd.org Received: from adelphi.physics.adelaide.edu.au (adelphi.physics.adelaide.edu.au [129.127.36.247]) by hub.freebsd.org (Postfix) with ESMTP id 1AFD21558E for ; Mon, 31 May 1999 21:18:20 -0700 (PDT) (envelope-from kkennawa@physics.adelaide.edu.au) Received: from bragg (bragg [129.127.36.34]) by adelphi.physics.adelaide.edu.au (8.8.8/8.8.8/UofA-1.5) with SMTP id NAA32387; Tue, 1 Jun 1999 13:48:19 +0930 (CST) Received: from localhost by bragg; (5.65/1.1.8.2/05Aug95-0227PM) id AA18567; Tue, 1 Jun 1999 13:49:21 +0930 Date: Tue, 1 Jun 1999 13:49:19 +0930 (CST) From: Kris Kennaway X-Sender: kkennawa@bragg To: Brook Miles Cc: freebsd-stable@freebsd.org Subject: Re: Keeping custom changes during a cvsup In-Reply-To: Message-Id: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Mon, 31 May 1999, Brook Miles wrote: > Can somebody point me in the right direction for maintaining custom > changes made to the source tree while still keeping up to date with > -stable or whatever branch you're following? > > For example the fix for PR bin/11860 consists of adding a line of code to > inetd.c, but cvsup'ing again clobbers the change. With cvsup you're basicalkly limited to saying "don't touch these files at all" (check the manpages for how to do this, I think they're called "refuse files"). DOing it this way means that if there are any "official" changes to the file then it will not be merged into yours - you have to take note and apply the patch yourself The better way is to use cvsup to maintain a local copy of the source CVS repository on your machine, and then use cvs to update from there. cvs is much smarter about merging revisions onto changed files, the only downside being that it's slower to update your source tree, and the CVS repository is quite large (>400MB, I think). Kris > +--- > | Brook Miles > | A spec of cosmic dust... with attitude. > +-------------------------------------- ----- "Never criticize anybody until you have walked a mile in their shoes, because by that time you will be a mile away and have their shoes." -- Unknown To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message