Date: Mon, 3 Feb 2003 22:39:19 -0800 (PST) From: Doug Barton <DougB@FreeBSD.org> To: Amit Rao <fbsd@atyantik.net> Cc: hackers@FreeBSD.org Subject: Re: Modifying mergemaster behavior Message-ID: <20030203223719.X11438@12-234-22-23.pyvrag.nggov.pbz> In-Reply-To: <200302031413.41855.fbsd@atyantik.net> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 3 Feb 2003, Amit Rao wrote:
> 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:" ?
That actually has promise... probably as a mergemasterrc option. I'll
give it some thought.
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030203223719.X11438>