From owner-svn-src-all@FreeBSD.ORG Sat Jan 3 07:57:52 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 314D4106566C; Sat, 3 Jan 2009 07:57:52 +0000 (UTC) (envelope-from ivoras@gmail.com) Received: from mail-bw0-f19.google.com (mail-bw0-f19.google.com [209.85.218.19]) by mx1.freebsd.org (Postfix) with ESMTP id EDE858FC16; Sat, 3 Jan 2009 07:57:50 +0000 (UTC) (envelope-from ivoras@gmail.com) Received: by bwz12 with SMTP id 12so17917754bwz.19 for ; Fri, 02 Jan 2009 23:57:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:sender :to:subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references :x-google-sender-auth; bh=+WYpDz9hAZNU5hy7qqgu+gGNQ1tHPfJz5evXiRftXU4=; b=xBJEAj1vLkGuF5R10/i49MtEf0YND07IwXzoVjgmMiTN0D2maktpzgV0IdDD9xyNbg Dgh7Ws5mG/SKXV5cv/PAnNmKBUnccfoBkXrDZpojdBbFieh7ZCgPPjf8hnqZh1q52Fls aC01W2wuv2Y+4jzIjqAlknhPEFgB9GbY8Leac= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references:x-google-sender-auth; b=rynXtnx10RGssK0vKSaRy2IsakQ27NywXkpSvhKM5FX/s9KzSrTK0ZE+aePfJIgb1p gzKqlO4Xbg+/3+1H2Vaz2+hNdF4GFfs7TCP64MFTAYtKNH9MqDl+uS1ABWP0D9x7wdk3 MCbAbMZUSEQMasajuwDwN/Q1j9RE9y1GHPhSg= Received: by 10.181.209.1 with SMTP id l1mr7176775bkq.139.1230969469506; Fri, 02 Jan 2009 23:57:49 -0800 (PST) Received: by 10.180.208.17 with HTTP; Fri, 2 Jan 2009 23:57:49 -0800 (PST) Message-ID: <9bbcef730901022357l1dc9205ahfa7db117e5aceb2a@mail.gmail.com> Date: Sat, 3 Jan 2009 08:57:49 +0100 From: "Ivan Voras" Sender: ivoras@gmail.com To: "Julian Elischer" In-Reply-To: <495EFF98.8080701@elischer.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline 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> <495EFF98.8080701@elischer.org> X-Google-Sender-Auth: 43f7c1006396ea80 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 07:57:52 -0000 2009/1/3 Julian Elischer : > 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. Yes, I completely forgot to rant about the typeahead problem :) On the other hand, this might point to a user-interface problem. Maybe if instead of constantly requesting user input it could be modified to work differently - maybe it could generate a machine readable report of files and autoload it in $EDITOR, in which the user could mark the files en masse (in some easy way, for example by killing the lines containing filenames he doesn't want to upgrade, prepending filenames with "m" for merging, etc), which would then be processed by the script? But again this would save irritation only if there's a quick way to specify "just upgrade everything that wasn't changed by the user". > 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? I think that's what /var/db/mergemaster.mtree is used for.