svn: head/usr.sbin/mergemaster

Julian Elischer julian at
Sat Jan 3 06:03:07 UTC 2009

Ivan Voras wrote:

> And just how can upgrading all the non-user-modified files cause
> serious damage here (serious=system not bootable, login not possible,
> etc)? Please explain with examples, since from this and the old
> current@ thread I only got the impression that "it's baaaad, m'kay".
> Note that regular users will not upgrade -CURRENT, and most won't even
> upgrade -STABLE, but will go from one -RELEASE to another. Speaking
> for myself, mergemaster is a source of constant irritation because it
> doesn't do auto-upgrades by default, and I'm often tempted to just not
> start it rather than going through 15 minutes of "q, i, <enter>" (my
> pages is less, thus the "q").

Not to mention the times when it seems some large number of files
get a change in CVS ID or whatever for some reason (and no other 
change (for example someone put a tem change in some subset of
the rc.d files and then removed it) which seems to happen
regularly, then you have to go i i i i i i i i i i i i i i i
for 10 minutes, and then you get into finger-typeahead and
it then goes right past the one file you DIDN'T want to change
and you have lost /etc/master.passwd or something.

I really like Mergemaster but it needs options like the one you just 
removed  to make it livable.

The -U option goes part way towards this.. How does it know what files
have not been user modified?  Does it store hashes from the last run 

More information about the svn-src-head mailing list