Date: Thu, 13 Apr 2006 14:34:08 -0400 From: Garance A Drosihn <drosih@rpi.edu> To: "Marc G. Fournier" <scrappy@hub.org> Cc: arch@freebsd.org Subject: Re: Mergemaster enhancement Message-ID: <p06230920c064496664e7@[128.113.24.47]> In-Reply-To: <20060413150544.N1096@ganymede.hub.org> References: <443DFC58.6060502@tetlows.org> <443E9167.6090309@elischer.org> <20060413150544.N1096@ganymede.hub.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?p06230920c064496664e7>