Date: Sun, 9 Feb 2003 22:32:56 -0800 (PST) From: Doug Barton <DougB@FreeBSD.org> To: Garance A Drosihn <drosih@rpi.edu> Cc: hackers@FreeBSD.org Subject: Re: Modifying mergemaster behavior Message-ID: <20030209223025.D866@12-234-22-23.pyvrag.nggov.pbz> In-Reply-To: <p05200f05ba6b7ebab20a@[128.113.24.47]> 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> <20030205031711.O27397@12-234-22-23.pyvrag.nggov.pbz> <p05200f05ba6b7ebab20a@[128.113.24.47]>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 8 Feb 2003, Garance A Drosihn wrote:
> At 3:21 AM -0800 2/5/03, Doug Barton wrote:
> >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.
>
> Well, this gets into an interesting exercise in quoting...
>
> I think I really want:
>
> DIFF_OPTIONS='-I $FreeBSD:.*[$]'
>
> to get the behavior I wanted, because the pattern should match
> a literal $, and not have the $ be treated as "to end-of-line".
Good point. I've amended the example.
> I think my reasoning is correct there. It also seems to work
> right with or without the blank after the -I.
It certainly should. :) I chose not to insert a blank to avoid future
problems with quoted/unquoted output.
> Also note that the example in the man page expanded to:
Argh. I thought of that, but didn't think cvs would be quite so...
helpful. I will re-check the results this time.
Thanks!
Doug
--
"The last time France wanted more evidence, it rolled right
through Paris with a German flag." - David Letterman
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?20030209223025.D866>