From owner-freebsd-stable Wed Feb 14 9:48:45 2001 Delivered-To: freebsd-stable@freebsd.org Received: from guru.mired.org (okc-65-26-235-186.mmcable.com [65.26.235.186]) by hub.freebsd.org (Postfix) with SMTP id 7E35937B401 for ; Wed, 14 Feb 2001 09:48:42 -0800 (PST) Received: (qmail 7765 invoked by uid 100); 14 Feb 2001 17:48:41 -0000 From: Mike Meyer MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <14986.50425.254712.942186@guru.mired.org> Date: Wed, 14 Feb 2001 11:48:41 -0600 To: Stephen Montgomery-Smith Cc: freebsd-stable@FreeBSD.ORG Subject: Re: Different approach to mergemaster In-Reply-To: <3A8AB391.12D1D822@math.missouri.edu> References: <3A8AB391.12D1D822@math.missouri.edu> X-Mailer: VM 6.89 under 21.1 (patch 14) "Cuyahoga Valley" XEmacs Lucid X-face: "5Mnwy%?j>IIV\)A=):rjWL~NB2aH[}Yq8Z=u~vJ`"(,&SiLvbbz2W`;h9L,Yg`+vb1>RG% *h+%X^n0EZd>TM8_IB;a8F?(Fb"lw'IgCoyM.[Lg#r\ Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Stephen Montgomery-Smith types: > Before mergemaster came popular, I developed my own approach > to updating /etc which works rather nicely. I never did get > around to trying mergemaster, but I see emails where from time > to time people have troubles with it, and I thought that I > would share my approach. > > What I have is a seperate directory called /usr/etc-chg. I run > > cd /usr/src/etc > make DESTDIR=/usr/etc-chg/$CURRENTVERSION distrib-dirs distribution > > where $CURRENTVERSION is some label describing the current make world > that I have just done (or about to do). Since I use CTM, this label > is the ctm-delta number. But I am sure that other ways could be made. [...] I don't really have trouble with it - I just wish there were some files it would just quietly update and not bother me about. Not all of them - I want to see changes to /etc/defaults, even though I'm just going to install them. But I don't really care about most of the /etc/rc.* files; I use the hooks in rc.conf to control those, and seeing the changes /etc/defaults/rc.conf is sufficient. I have though about doing something like what you talk about. I already keep all the system config files in perforce. Keeping two copies of the etc stuff around, with a script to build the vendor copy and update the depot so I could integrate it back into mine would be pretty simple. I already do that for my kernel config files. But I'd then miss some of the changes I want to see. Of course, mergemaster can do it now - if you write the pre-compare script for it. But making everyone reinvent that wheel seems a bit much. A variable that can only be set via .mergemasterrc that held a list of anchored REs - or maybe just file names - would seem to be a reasonable addition. That way, you have to actively point the gun at your feet before you can shoot yourself. http://www.mired.org/home/mwm/ Independent WWW/Perforce/FreeBSD/Unix consultant, email for more information. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message