sysutils/etcmerge vs mergemaster

[RW]

On Sun, 18 Nov 2007 13:01:56 +0100
Peter Schuller <peter.schuller at infidyne.com> wrote:

> >  Isn't that what the -U option in mergemaster does?
> >
> >
> >    -U       Attempt to auto upgrade files that have not been user
> >                                                        modified.
> 
> I believe I tried this once and it did not make a difference, but I
> didn't investigate. Perhaps I screwed up.

It's something I only noticed on the 6.2 upgrade, and I've never
actually used.  It seems to work by comparing hashes of installed files
with the cvs versions from the previous run. I guess it doesn't work on
the first upgrade as there's no stored database.