mergemaster -U ask for a lot non-user modified files

[David Demelier]

On 18/02/2011 14:25, Lowell Gilbert wrote:
> David Demelier<demelier.david at gmail.com>  writes:
>
>> Hello,
>>
>> Each time I run mergemaster -UiF, it asks for a lot of file that I do
>> not have modified such as /dev/rc.d/* and /etc/defaults/*
>>
>>
>> ======================================================================
>>
>>
>>    Use 'd' to delete the temporary ./etc/network.subr
>>    Use 'i' to install the temporary ./etc/network.subr
>>    Use 'm' to merge the temporary and installed versions
>>    Use 'v' to view the diff results again
>>
>>    Default is to leave the temporary file to deal with by hand
>>
>> How should I deal with this? [Leave it for later]
>>
>> I never touched this file! Why it asks me to install the new one?
>
> You're probably having problems with the mtree database that mergemaster
> uses for that.  I think by default it's /var/db/mergemaster.mtree.
>

I also noticed that even with the -F flag, mergemaster still asks for 
files that only differs by CVS id, see :

-#####  $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.2.1 2010/06/14 
02:09:0 6 kensmith Exp $  #####
  +#####  $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.4.1 
2010/12/21 17:09:2 5 kensmith Exp $  #####

It's really painful..

-- 
David Demelier