From owner-freebsd-hackers  Wed Feb  5  3:21: 8 2003
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 039FA37B401
	for <hackers@FreeBSD.org>; Wed,  5 Feb 2003 03:21:07 -0800 (PST)
Received: from 12-234-22-23.client.attbi.com (12-234-22-23.client.attbi.com [12.234.22.23])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 295E243F75
	for <hackers@FreeBSD.org>; Wed,  5 Feb 2003 03:21:06 -0800 (PST)
	(envelope-from DougB@FreeBSD.org)
Received: from slave.gorean.org (bo5e3tfibzy3335f@slave.gorean.org [10.0.0.1])
	by 12-234-22-23.client.attbi.com (8.12.6/8.12.6) with ESMTP id h15BL4h9030340;
	Wed, 5 Feb 2003 03:21:04 -0800 (PST)
	(envelope-from DougB@FreeBSD.org)
Date: Wed, 5 Feb 2003 03:21:04 -0800 (PST)
From: Doug Barton <DougB@FreeBSD.org>
To: Amit Rao <fbsd@atyantik.net>
Cc: Dag-Erling Smorgrav <des@ofug.org>,
	Garance A Drosihn <drosih@rpi.edu>, hackers@FreeBSD.org
Subject: Re: Modifying mergemaster behavior
In-Reply-To: <200302031413.41855.fbsd@atyantik.net>
Message-ID: <20030205031711.O27397@12-234-22-23.pyvrag.nggov.pbz>
References: <200301281844.h0SIie3G086935@repoman.freebsd.org>
 <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> <xzpy94xa6fb.fsf@flood.ping.uio.no>
 <200302031413.41855.fbsd@atyantik.net>
Organization: http://www.FreeBSD.org/
X-message-flag: Outlook -- Not just for spreading viruses anymore!
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-freebsd-hackers@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-hackers.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-hackers>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-hackers>
X-Loop: FreeBSD.ORG

On Mon, 3 Feb 2003, Amit Rao wrote:

> Allow users to pass "regexps to ignore" as an option?
> similar to:  diff --ignore-matching-lines="\$FreeBSD:" ?

I decided to be more general, and added the DIFF_OPTIONS variable to the
script, and an example of -I$FreeBSD:.*$ to the man page. For now I'm
going to leave this as a "power user" ~/.mergemasterrc file option. Once
people have a chance to use this and provide feedback on it, I may add a
command line option for it.

Thanks again for all the ideas,

Doug

-- 

    If it's moving, encrypt it. If it's not moving, encrypt
      it till it moves, then encrypt it some more.

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message