From owner-freebsd-hackers Sun Feb 9 22:34:37 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 B88BA37B401 for ; Sun, 9 Feb 2003 22:34:35 -0800 (PST) Received: from 12-234-22-23.client.attbi.com (12-234-22-23.client.attbi.com [12.234.22.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5760C43FCB for ; Sun, 9 Feb 2003 22:33:09 -0800 (PST) (envelope-from DougB@FreeBSD.org) Received: from dougb.net (gtn02kxr6gamcdzm@dougb.net [10.0.0.1]) by 12-234-22-23.client.attbi.com (8.12.6/8.12.6) with ESMTP id h1A6WuS8002771; Sun, 9 Feb 2003 22:32:56 -0800 (PST) (envelope-from DougB@FreeBSD.org) Date: Sun, 9 Feb 2003 22:32:56 -0800 (PST) From: Doug Barton To: Garance A Drosihn Cc: hackers@FreeBSD.org Subject: Re: Modifying mergemaster behavior In-Reply-To: Message-ID: <20030209223025.D866@12-234-22-23.pyvrag.nggov.pbz> References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> <200302031413.41855.fbsd@atyantik.net> <20030205031711.O27397@12-234-22-23.pyvrag.nggov.pbz> Organization: http://www.FreeBSD.org/ X-message-flag: Outlook -- Not just for spreading viruses anymore! MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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