From owner-freebsd-stable@FreeBSD.ORG Sun Mar 14 09:10:15 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 02D411065675 for ; Sun, 14 Mar 2010 09:10:15 +0000 (UTC) (envelope-from byshenknet@byshenk.net) Received: from core.byshenk.net (core.byshenk.net [62.58.73.230]) by mx1.freebsd.org (Postfix) with ESMTP id 8F4548FC14 for ; Sun, 14 Mar 2010 09:10:14 +0000 (UTC) Received: from core.byshenk.net (localhost [127.0.0.1]) by core.byshenk.net (8.14.4/8.14.4) with ESMTP id o2E9BIGM067233; Sun, 14 Mar 2010 10:11:18 +0100 (CET) (envelope-from byshenknet@core.byshenk.net) Received: (from byshenknet@localhost) by core.byshenk.net (8.14.4/8.14.4/Submit) id o2E9BIVR067232; Sun, 14 Mar 2010 10:11:18 +0100 (CET) (envelope-from byshenknet) Date: Sun, 14 Mar 2010 10:11:18 +0100 From: Greg Byshenk To: freebsd-stable@freebsd.org Message-ID: <20100314091118.GM2303@core.byshenk.net> References: <20100312101350.GH2303@core.byshenk.net> <4B9C753E.7030102@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4B9C753E.7030102@FreeBSD.org> User-Agent: Mutt/1.4.2.3i X-Spam-Status: No, score=1.9 required=5.0 tests=ALL_TRUSTED, FH_DATE_PAST_20XX autolearn=no version=3.2.5 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on core.byshenk.net Cc: Doug Barton 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:10:15 -0000 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. -- greg byshenk - gbyshenk@byshenk.net - Leiden, NL