From owner-freebsd-hackers Sat Feb 8 19:55:50 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 1580D37B40A; Sat, 8 Feb 2003 19:55:49 -0800 (PST) Received: from mail.rpi.edu (mail.rpi.edu [128.113.2.7]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4125443F3F; Sat, 8 Feb 2003 19:55:48 -0800 (PST) (envelope-from drosih@rpi.edu) Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47]) by mail.rpi.edu (8.12.1/8.12.1) with ESMTP id h193tgC6136654; Sat, 8 Feb 2003 22:55:42 -0500 Mime-Version: 1.0 X-Sender: drosih@mail.rpi.edu Message-Id: 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> <200302031413.41855.fbsd@atyantik.net> <20030205031711.O27397@12-234-22-23.pyvrag.nggov.pbz> Date: Sat, 8 Feb 2003 22:55:40 -0500 To: Doug Barton , Amit Rao From: Garance A Drosihn Subject: Re: Modifying mergemaster behavior Cc: Dag-Erling Smorgrav , hackers@FreeBSD.ORG Content-Type: text/plain; charset="us-ascii" ; format="flowed" X-Scanned-By: MIMEDefang 2.3 (www dot roaringpenguin dot com slash mimedefang) 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 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