From owner-freebsd-stable@FreeBSD.ORG Tue Dec 28 00:40:28 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 C61F61065673 for ; Tue, 28 Dec 2010 00:40:28 +0000 (UTC) (envelope-from ml@my.gd) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 65EBD8FC15 for ; Tue, 28 Dec 2010 00:40:28 +0000 (UTC) Received: by wyf19 with SMTP id 19so8824100wyf.13 for ; Mon, 27 Dec 2010 16:40:27 -0800 (PST) Received: by 10.227.157.73 with SMTP id a9mr5566706wbx.154.1293496827384; Mon, 27 Dec 2010 16:40:27 -0800 (PST) Received: from dfleuriot.local (paris.c-mal.com [88.170.200.60]) by mx.google.com with ESMTPS id q18sm8848505wbe.17.2010.12.27.16.40.26 (version=SSLv3 cipher=RC4-MD5); Mon, 27 Dec 2010 16:40:26 -0800 (PST) Message-ID: <4D1931FA.3070403@my.gd> Date: Tue, 28 Dec 2010 01:40:26 +0100 From: Damien Fleuriot User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 MIME-Version: 1.0 To: freebsd-stable@freebsd.org References: <20101227224426.GA11955@lava.net> <20101227224752.GC1505@eggman.experts-exchange.com> <20101227225828.GB11955@lava.net> In-Reply-To: <20101227225828.GB11955@lava.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: Accidentally aborted upgrade via freebsd-update - how to recover? 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: Tue, 28 Dec 2010 00:40:28 -0000 On 12/27/10 11:58 PM, Clifton Royston wrote: > > OK, and oh well... I wish there were some way to automate the diffing > out of the $FreeBSD lines. I suppose those might be the artifact of > some previous upgrade, so that the file version present is not the one > expected for FreeBSD 6.1. > > -- Clifton > Wait, do you mean like, mergemaster -F ? Excerpt from the manual: -F If the files differ only by VCS Id ($FreeBSD) install the new file. I've discovered this rather recently, it's a *lifesaver* This comes from fbsd7's version though, I can not say for the one you're still running on fbsd6