From owner-freebsd-stable@FreeBSD.ORG Sun Mar 14 09:40:34 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 6E84E106566B for ; Sun, 14 Mar 2010 09:40:34 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id F09038FC08 for ; Sun, 14 Mar 2010 09:40:33 +0000 (UTC) Received: (qmail 15752 invoked by uid 399); 14 Mar 2010 09:40:33 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 14 Mar 2010 09:40:33 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4B9CAF10.7060301@FreeBSD.org> Date: Sun, 14 Mar 2010 01:40:32 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.7) Gecko/20100218 Thunderbird/3.0.1 MIME-Version: 1.0 To: Greg Byshenk References: <20100312101350.GH2303@core.byshenk.net> <4B9C753E.7030102@FreeBSD.org> <20100314091118.GM2303@core.byshenk.net> In-Reply-To: <20100314091118.GM2303@core.byshenk.net> X-Enigmail-Version: 1.0.1 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: 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:40:34 -0000 On 03/14/10 01:11, 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". Generally > I want to know what is being modified, even if it is in a file that I > haven't changed. I 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. Ok, fair enough; that's why there are two options. :) Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/