mergemaster -U overwriting modified files

[Frederique Rijsdijk]

Bruce Cran wrote:
> On Sat, 25 Apr 2009 12:10:42 +0200
> Peter Schuller <peter.schuller at infidyne.com> wrote:
>
>   
>> I recently began testing mergemaster -U since the perpetual "review
>> diff of file I never touched" grows annoying real quick.
>>
>> Unfortunately I recently discovered that it does not seem to do what
>> you might expect. For example it nuked my mailer.conf on one machine,
>> and my /etc/namedb/named.conf (!!!) on another machine.
>>
>> Is this a bug or intended? What is the intended functionality of -U?
>>
>>     
>
> I noticed this recently too: after using mergemaster -U without
> problems for a long time it suddenly went and overwrote named.conf on
> a recently upgrade of 7-STABLE.
>
>   
I've seen this happen as well with named.conf.

I've noticed that sometimes the -U flag doesn't work (I use -Ui), I 
still have to install the never touched files by hand. Can't put a 
finger on it though.


-- Frederique