From owner-freebsd-hackers  Mon Feb  3 11:13:45 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 1C61737B401; Mon,  3 Feb 2003 11:13:44 -0800 (PST)
Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 125FE43F93; Mon,  3 Feb 2003 11:13:38 -0800 (PST)
	(envelope-from fbsd@atyantik.net)
Received: from pininfarina.mj.niksun.com (anuket.mj.niksun.com [10.70.0.5])
	by anuket.mj.niksun.com (8.12.3/8.12.3) with ESMTP id h13JDCus077231;
	Mon, 3 Feb 2003 14:13:13 -0500 (EST)
	(envelope-from fbsd@atyantik.net)
X-RAV-AntiVirus: This e-mail has been scanned for viruses.
Content-Type: text/plain;
  charset="iso-8859-1"
From: Amit Rao <fbsd@atyantik.net>
To: Dag-Erling Smorgrav <des@ofug.org>,
	Doug Barton <DougB@FreeBSD.ORG>
Subject: Re: Modifying mergemaster behavior
Date: Mon, 3 Feb 2003 14:13:41 -0500
User-Agent: KMail/1.4.3
Cc: Garance A Drosihn <drosih@rpi.edu>,
	Matthew Dillon <dillon@apollo.backplane.com>, hackers@FreeBSD.ORG
References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> <xzpy94xa6fb.fsf@flood.ping.uio.no>
In-Reply-To: <xzpy94xa6fb.fsf@flood.ping.uio.no>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Message-Id: <200302031413.41855.fbsd@atyantik.net>
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 Monday 03 February 2003 07:35 am, Dag-Erling Smorgrav wrote:
> Doug Barton <DougB@FreeBSD.org> writes:
> > On Tue, 28 Jan 2003, Garance A Drosihn wrote:
> > > Well for one thing, if a given file has a lot of changes, then I
> > > would like mergemaster to skip over the initial one-line change
> > > that only tells me how some comment now has a new version-number
> > > in it.
> >
> > This is an oft-requested feature, but I'm not sure how best to implement
> > it.

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


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