From owner-freebsd-stable@FreeBSD.ORG Tue Dec 28 04:23:23 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 5C950106566B for ; Tue, 28 Dec 2010 04:23:23 +0000 (UTC) (envelope-from cliftonr@lava.net) Received: from outgoing03.lava.net (outgoing03.lava.net [IPv6:2001:1888:0:1:202:b3ff:fe1d:6b98]) by mx1.freebsd.org (Postfix) with ESMTP id 096488FC1A for ; Tue, 28 Dec 2010 04:23:23 +0000 (UTC) Received: from malasada.lava.net (malasada.lava.net [64.65.64.17]) by outgoing03.lava.net (Postfix) with ESMTP id 68789101E3; Mon, 27 Dec 2010 18:23:22 -1000 (HST) Received: by malasada.lava.net (Postfix, from userid 102) id 0E788196E1C; Mon, 27 Dec 2010 18:23:21 -1000 (HST) Date: Mon, 27 Dec 2010 18:23:20 -1000 From: Clifton Royston To: Damien Fleuriot Message-ID: <20101228042320.GA12184@lava.net> Mail-Followup-To: Damien Fleuriot , freebsd-stable@freebsd.org References: <20101227224426.GA11955@lava.net> <20101227224752.GC1505@eggman.experts-exchange.com> <20101227225828.GB11955@lava.net> <4D1931FA.3070403@my.gd> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4D1931FA.3070403@my.gd> User-Agent: Mutt/1.4.2.3i Cc: freebsd-stable@freebsd.org 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 04:23:23 -0000 On Tue, Dec 28, 2010 at 01:40:26AM +0100, Damien Fleuriot wrote: > > > 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. So *is* freebsd-update invoking mergemaster? There wasn't anything in its man page indicating that, or indicating how to pass flags to it if it is. My assumption was that it wasn't, because it doesn't show the usual mergemaster 4 options with each file (new, delete new, merge old/new, or defer to later.) -- Clifton -- Clifton Royston -- cliftonr@iandicomputing.com / cliftonr@lava.net President - I and I Computing * http://www.iandicomputing.com/ Custom programming, network design, systems and network consulting services