Mergemaster enhancement

[Garance A Drosihn]

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 at gilead.netel.rpi.edu
Senior Systems Programmer           or  gad at freebsd.org
Rensselaer Polytechnic Institute    or  drosih at rpi.edu