From owner-freebsd-stable Thu Jan 28 08:51:39 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id IAA10127 for freebsd-stable-outgoing; Thu, 28 Jan 1999 08:51:39 -0800 (PST) (envelope-from owner-freebsd-stable@FreeBSD.ORG) Received: from dt050n08.san.rr.com (dt050n08.san.rr.com [204.210.31.8]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id IAA10120 for ; Thu, 28 Jan 1999 08:51:36 -0800 (PST) (envelope-from Studded@gorean.org) Received: from gorean.org (master [10.0.0.2]) by dt050n08.san.rr.com (8.8.8/8.8.8) with ESMTP id IAA05804; Thu, 28 Jan 1999 08:51:14 -0800 (PST) (envelope-from Studded@gorean.org) Message-ID: <36B0957D.E1453F04@gorean.org> Date: Thu, 28 Jan 1999 08:51:09 -0800 From: Studded Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.5 [en] (Win98; I) X-Accept-Language: en MIME-Version: 1.0 To: "Matthew D. Fuller" CC: Gregory Bond , Chris Knight , freebsd-stable@FreeBSD.ORG Subject: Re: mergemaster rocks! References: <199901280812.TAA29221@lightning.itga.com.au> <19990128024920.C16540@futuresouth.com> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG "Matthew D. Fuller" wrote: > > On Thu, Jan 28, 1999 at 07:12:09PM +1100, a little birdie told me > that Gregory Bond remarked > > > > but I wish there was an option to point out files in the live /etc that weren't > > in the prototype one ... > > > > and that it was smarter dealing with pwd.db and spwd.db > > Having some sort of 'exclude' file it could read would be a nice > addition. master.passwd, *.db, aliases, maybe sendmail.cw, rc.local... > some things you really don't want to mistakenly 'merge'... What I do is customize /usr/src/etc/Makefile so I don't have to deal with that situation. If the file doesn't exist in the temp root then mergemaster doesn't deal with it. :) However one of the things on my list is a .mergemaster.rc file where you can specify things like default command line settings, so I will take a look at adding a list of files to exclude from the merge. Thanks for the suggestion, Doug -- *** Chief Operations Officer, DALnet IRC network *** Like desperadoes waiting for a train . . . To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message