From owner-freebsd-hackers  Tue Feb  4  7:19:56 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 EED4D37B401
	for <freebsd-hackers@FreeBSD.ORG>; Tue,  4 Feb 2003 07:19:54 -0800 (PST)
Received: from mout1.freenet.de (mout1.freenet.de [194.97.50.132])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0EFC943F85
	for <freebsd-hackers@FreeBSD.ORG>; Tue,  4 Feb 2003 07:19:49 -0800 (PST)
	(envelope-from ino-qc@spotteswoode.de.eu.org)
Received: from [194.97.50.138] (helo=mx0.freenet.de)
	by mout1.freenet.de with asmtp (Exim 4.12)
	id 18g4rT-0002eo-00
	for freebsd-hackers@FreeBSD.ORG; Tue, 04 Feb 2003 16:19:47 +0100
Received: from pd9501617.dip.t-dialin.net ([217.80.22.23] helo=spotteswoode.dnsalias.org)
	by mx0.freenet.de with asmtp (ID inode@freenet.de) (Exim 4.12 #2)
	id 18g4rT-0000j9-00
	for freebsd-hackers@FreeBSD.ORG; Tue, 04 Feb 2003 16:19:47 +0100
Received: (qmail 13232 invoked by uid 0); 4 Feb 2003 15:19:46 -0000
Date: 4 Feb 2003 16:19:46 +0100
Message-ID: <4r7kkr8t.fsf@ID-23066.news.dfncis.de>
From: "clemens fischer" <ino-qc@spotteswoode.de.eu.org>
To: "Garance A Drosihn" <drosih@rpi.edu>
Cc: "Doug Barton" <DougB@FreeBSD.ORG>,
	"Dag-Erling Smorgrav" <des@ofug.org>, freebsd-hackers@FreeBSD.ORG
Subject: Re: Modifying mergemaster behavior
References: <200301281844.h0SIie3G086935@repoman.freebsd.org>
	<p05200f24ba5c8412dcd1@[128.113.24.47]>
	<200301281908.h0SJ8OoY028183@apollo.backplane.com>
	<p05200f26ba5c85ee4c77@[128.113.24.47]>
	<20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz>
	<xzpy94xa6fb.fsf@flood.ping.uio.no>
	<20030203091128.Y4113@12-234-22-23.pyvrag.nggov.pbz>
	<p05200f4cba64ed4989d3@[128.113.24.47]>
In-Reply-To: <p05200f4cba64ed4989d3@[128.113.24.47]> (Garance A Drosihn's
 message of "Mon, 3 Feb 2003 23:26:51 -0500")
User-Agent: Gnus/5.090008 (Oort Gnus v0.08) Emacs/21.3.50
 (i386-unknown-freebsd4.6.2)
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

Garance A Drosihn <drosih@rpi.edu>:

> I happen to be updating my system tonight, so when it came to the
> mergemaster step I first modified the script.  I added:
>         -I '$FreeBSD:.*$'
> to the 'diff ${DIFF_FLAG}' command in diff_loop, and it seems to have
> worked the way I wanted it to work.

how about making this an option value to the `-c' option?  `-c'
normally just switches to context-diffs, why not allow users to
specify his custom diff(1) options here and in the ~/.mergemasterrc?

  clemens

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