From owner-svn-src-all@FreeBSD.ORG Sat Jan 3 06:03:06 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0A6E1065670 for ; Sat, 3 Jan 2009 06:03:06 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outG.internet-mail-service.net (outg.internet-mail-service.net [216.240.47.230]) by mx1.freebsd.org (Postfix) with ESMTP id A52468FC18 for ; Sat, 3 Jan 2009 06:03:06 +0000 (UTC) (envelope-from julian@elischer.org) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id EE2B02376; Fri, 2 Jan 2009 22:03:05 -0800 (PST) X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e Received: from julian-mac.elischer.org (home.elischer.org [216.240.48.38]) by idiom.com (Postfix) with ESMTP id 40C882D600D; Fri, 2 Jan 2009 22:03:05 -0800 (PST) Message-ID: <495EFF98.8080701@elischer.org> Date: Fri, 02 Jan 2009 22:03:04 -0800 From: Julian Elischer User-Agent: Thunderbird 2.0.0.18 (Macintosh/20081105) MIME-Version: 1.0 To: Ivan Voras 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> In-Reply-To: <9bbcef730901021955s254b2eb5j24f93127e84fb5ee@mail.gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Doug Barton , src-committers@freebsd.org, Garrett Wollman Subject: Re: svn: head/usr.sbin/mergemaster X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jan 2009 06:03:07 -0000 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, " (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?