Version Number Only Changes

[Oliver Fromme]

Jason C. Wells wrote:
 > I am sure there is a reason for it.  Upon running mergemaster this time 
 > through it seemed like there were _a lot_ of files where the only change 
 > was the version number.  I have run to mergemaster on four more hosts.  Ugh!
 > 
 > mergemaster -aiU still seems to require a ton of interaction.  Is there 
 > a better way?

I have the following in /etc/mergemaster.rc:

DIFF_FLAG='-Bub'
DIFF_OPTIONS='-I$FreeBSD:.*[$]'
IGNORE_MOTD=yes

Also, I'm not sure you really want to use the -a option.

Best regards
   Oliver

-- 
Oliver Fromme, secnetix GmbH & Co. KG, Marktplatz 29, 85567 Grafing b. M.
Handelsregister: Registergericht Muenchen, HRA 74606,  Geschäftsfuehrung:
secnetix Verwaltungsgesellsch. mbH, Handelsregister: Registergericht Mün-
chen, HRB 125758,  Geschäftsführer: Maik Bachmann, Olaf Erb, Ralf Gebhart

FreeBSD-Dienstleistungen, -Produkte und mehr:  http://www.secnetix.de/bsd

"When your hammer is C++, everything begins to look like a thumb."
        -- Steve Haflich, in comp.lang.c++