Date: Fri, 02 Jan 2009 22:03:04 -0800 From: Julian Elischer <julian@elischer.org> To: Ivan Voras <ivoras@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Doug Barton <dougb@freebsd.org>, src-committers@freebsd.org, Garrett Wollman <wollman@bimajority.org> Subject: Re: svn: head/usr.sbin/mergemaster Message-ID: <495EFF98.8080701@elischer.org> In-Reply-To: <9bbcef730901021955s254b2eb5j24f93127e84fb5ee@mail.gmail.com> References: <200901011055.n01AtQaN052763@svn.freebsd.org> <495DB15B.8040908@FreeBSD.org> <495DB9B6.4030801@FreeBSD.org> <495DC5AF.3050908@FreeBSD.org> <495E91F8.3010706@FreeBSD.org> <18782.37537.775290.682466@hergotha.csail.mit.edu> <495E9E4B.8030905@FreeBSD.org> <9bbcef730901021955s254b2eb5j24f93127e84fb5ee@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 somewhere?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?495EFF98.8080701>