From owner-freebsd-stable@FreeBSD.ORG Sun Mar 14 09:28:18 2010 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90785106564A; Sun, 14 Mar 2010 09:28:18 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-pw0-f54.google.com (mail-pw0-f54.google.com [209.85.160.54]) by mx1.freebsd.org (Postfix) with ESMTP id 5CEB18FC0A; Sun, 14 Mar 2010 09:28:18 +0000 (UTC) Received: by pwj4 with SMTP id 4so1618557pwj.13 for ; Sun, 14 Mar 2010 01:28:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=LOmOBmPTcDecBA4aDPWeMt4IUvYWaLO75vUy4wCtJsg=; b=KaYzHDNovXvWV8c2WWLwvXaQpJxszuzgLF50ZQ2+i6pCLeM9ovDUcpcUAW7uFcWPmP uD4MwuKChkf0kJLg7zgJjMyR/6saTmWgLtII8WRwxn3PzYPSlM8iToQTM81ED0sEdW4Q nXjfZCl7lHWBjajn1LAXDRiLVc/EEZW72hJo8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=e4foQRg5NrrvP2fZh2q3UsxK1hv9T5o5VKShNUHvpI1nXP8SYitnXYI4VXDKv1Sk8F tMlGxJ93zCgijMh7nUp3DNaQKCSZli4gm+3qchByJAsXDVb5jI2nknbumsCqTfIfmdCi gByNEKtHLk2bXEU6KzGTwqB56gmSkeQT23YtY= MIME-Version: 1.0 Received: by 10.143.27.20 with SMTP id e20mr4244250wfj.256.1268558897779; Sun, 14 Mar 2010 01:28:17 -0800 (PST) In-Reply-To: <20100314091118.GM2303@core.byshenk.net> References: <20100312101350.GH2303@core.byshenk.net> <4B9C753E.7030102@FreeBSD.org> <20100314091118.GM2303@core.byshenk.net> Date: Sun, 14 Mar 2010 01:28:17 -0800 Message-ID: <7d6fde3d1003140128w9c10d7ar308d6f115b80889b@mail.gmail.com> From: Garrett Cooper To: Greg Byshenk Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Doug Barton , freebsd-stable@freebsd.org Subject: Re: I broke my SSH to jails after 7.2-8.0 src upgrade X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Mar 2010 09:28:18 -0000 On Sun, Mar 14, 2010 at 1:11 AM, Greg Byshenk wrote: > On Sat, Mar 13, 2010 at 09:33:50PM -0800, Doug Barton wrote: >> On 03/12/10 02:13, Greg Byshenk wrote: > >> > I would put in a word for 'mergemaster -F' (or maybe '-iF') in such >> > cases. > >> At this point the -U option is generally a safer bet. The only time this >> won't work for you is when upgrading from an older -RELEASE where you've >> never run mergemaster previously, in which case it will bark loudly that >> there is no mtree database. You could then run 'mergemaster -Fi' as you >> suggested, and run 'mergemaster -U' immediately thereafter and you >> should get as much "automation" as is possible. > > I don't actually want "as much 'automation' as is possible". =A0Generally > I want to know what is being modified, even if it is in a file that I > haven't changed. =A0I like '-F' because it allows me to ignore the huge > number of files that aren't actually changed -- except the RCS line -- > that sometimes arise when moving between versions. Excellent point. People who use FreeBSD don't want automation necessarily -- if they wanted a software developer to make all of the decisions for them, there's always OSX or Windows. FreeBSD users (in general) appreciate the completeness and simplicity in the OS design, but wherever possible if unnecessary noise can be avoided, all the better. Just a thought... Cheers, -Garrett