Date: Sat, 8 Feb 2003 22:55:40 -0500 From: Garance A Drosihn <drosih@rpi.edu> To: Doug Barton <DougB@FreeBSD.ORG>, Amit Rao <fbsd@atyantik.net> Cc: Dag-Erling Smorgrav <des@ofug.org>, hackers@FreeBSD.ORG Subject: Re: Modifying mergemaster behavior Message-ID: <p05200f05ba6b7ebab20a@[128.113.24.47]> In-Reply-To: <20030205031711.O27397@12-234-22-23.pyvrag.nggov.pbz> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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". I think my reasoning is correct there. It also seems to work right with or without the blank after the -I. Also note that the example in the man page expanded to: #DIFF_OPTIONS='-I$FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.25 2003/02/05 11:03:05 dougb Exp $' # Ignores CVS Id tags which would probably baffle anyone who reads it! -- Garance Alistair Drosehn = gad@gilead.netel.rpi.edu Senior Systems Programmer or gad@freebsd.org Rensselaer Polytechnic Institute or drosih@rpi.edu 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?p05200f05ba6b7ebab20a>