From owner-freebsd-current@FreeBSD.ORG  Wed Jan 21 16:16:14 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8788D16A4CE
	for <freebsd-current@freebsd.org>;
	Wed, 21 Jan 2004 16:16:14 -0800 (PST)
Received: from mx2.synetsystems.com (mx2.synetsystems.com [216.29.169.6])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D29EA43D31
	for <freebsd-current@freebsd.org>;
	Wed, 21 Jan 2004 16:16:12 -0800 (PST)
	(envelope-from rmtodd@servalan.servalan.com)
Received: by mx2.synetsystems.com (Postfix, from userid 66)
	id 1D0E8261; Wed, 21 Jan 2004 19:16:12 -0500 (EST)
Received: from rmtodd by servalan.servalan.com with local (Exim 4.22)
	id 1AjRin-000PJf-8o
	for freebsd-current@freebsd.org; Wed, 21 Jan 2004 17:25:17 -0600
To: freebsd-current@freebsd.org
Orig-To: Peter Ulrich Kruppa <root@pukruppa.de>
References: <400C012E.4040002@mail.ru> 	<400C0E5F.5010606@potentialtech.com>
	<20040119221449.W1109@pukruppa.net>
Message-Id: <E1AjRin-000PJf-8o@servalan.servalan.com>
From: Richard Todd <rmtodd@servalan.servalan.com>
Date: Wed, 21 Jan 2004 17:25:17 -0600
X-Mailman-Approved-At: Thu, 22 Jan 2004 05:07:24 -0800
Subject: Re: question on mergemaster
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jan 2004 00:16:14 -0000

Peter Ulrich Kruppa wrote:
>What about a file "mergemaster_ignore" where I put in the six or
>seven names of files that should never be touched?

You can do this already with a little fiddling with the .mergemasterrc file.
I have a /root/.mergemasterrc file that looks like this:
------------------------
MM_PRE_COMPARE_SCRIPT=/usr/local/bin/mergemaster_precompare
------------------------

MM_PRE_COMPARE_SCRIPT specifies a script that gets run after the temproot
dir gets populated but before mergemaster starts comparing it against the
current /etc contents. My /usr/local/bin/mergemaster_precompare looks like 
this:
------------------------
#!/bin/sh
cd /var/tmp/temproot
rm etc/master.passwd etc/group etc/ppp/ppp.conf etc/mail/aliases etc/amd.map etc/hosts
------------------------
which removes those files from the set of "new" files mergemaster considers
possibly installing.