Date: Mon, 3 Feb 2003 14:13:41 -0500 From: Amit Rao <fbsd@atyantik.net> To: Dag-Erling Smorgrav <des@ofug.org>, Doug Barton <DougB@FreeBSD.ORG> Cc: Garance A Drosihn <drosih@rpi.edu>, Matthew Dillon <dillon@apollo.backplane.com>, hackers@FreeBSD.ORG Subject: Re: Modifying mergemaster behavior Message-ID: <200302031413.41855.fbsd@atyantik.net> In-Reply-To: <xzpy94xa6fb.fsf@flood.ping.uio.no> References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> <xzpy94xa6fb.fsf@flood.ping.uio.no>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302031413.41855.fbsd>