From owner-freebsd-arch@FreeBSD.ORG Thu Apr 13 18:34:12 2006 Return-Path: X-Original-To: arch@freebsd.org Delivered-To: freebsd-arch@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5372D16A402 for ; Thu, 13 Apr 2006 18:34:12 +0000 (UTC) (envelope-from drosih@rpi.edu) Received: from smtp3.server.rpi.edu (smtp3.server.rpi.edu [128.113.2.3]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB89943D49 for ; Thu, 13 Apr 2006 18:34:11 +0000 (GMT) (envelope-from drosih@rpi.edu) Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47]) by smtp3.server.rpi.edu (8.13.1/8.13.0) with ESMTP id k3DIY9jk026351; Thu, 13 Apr 2006 14:34:10 -0400 Mime-Version: 1.0 Message-Id: In-Reply-To: <20060413150544.N1096@ganymede.hub.org> References: <443DFC58.6060502@tetlows.org> <443E9167.6090309@elischer.org> <20060413150544.N1096@ganymede.hub.org> Date: Thu, 13 Apr 2006 14:34:08 -0400 To: "Marc G. Fournier" From: Garance A Drosihn Content-Type: text/plain; charset="us-ascii" ; format="flowed" X-CanItPRO-Stream: default X-RPI-SA-Score: undef - spam-scanning disabled X-Scanned-By: CanIt (www . canit . ca) on 128.113.2.3 Cc: arch@freebsd.org Subject: Re: Mergemaster enhancement X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 18:34:12 -0000 At 3:07 PM -0300 4/13/06, Marc G. Fournier wrote: > >I don't know if there is any way of doing this "automatically", >but the one beef I have with mergemaster is it prompting me >whether I want to install the new one if all that has changed >is the $Id tag ... I don't mind looking at the diff of the >ones that there are actual changes to, or doing a -U to 'skip' >those, but would be nice if the ones that *really* haven't >changed were done automatically ... In my ~/.mergemasterrc , I have the line: DIFF_OPTIONS='-I $FreeBSD:.*[$]' I think that handles the case you're talking about. At least it doesn't show me the $FreeBSD$ tag changes, and I don't remember any recent case where I was prompted for a file which had no other changes. -- Garance Alistair Drosehn = gad@gilead.netel.rpi.edu Senior Systems Programmer or gad@freebsd.org Rensselaer Polytechnic Institute or drosih@rpi.edu