mergemaster -U overwriting modified files

[Victor Sudakov]

Peter Schuller 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?

It may be useful, prior to running "mergemaster -U", to run 
mtree -eq -f /var/db/mergemaster.mtree -p / | grep changed
to see what mergemaster considers changed.



-- 
Victor Sudakov,  VAS4-RIPE, VAS47-RIPN
sip:sudakov at sibptus.tomsk.ru