Date: Tue, 28 Dec 2010 01:40:26 +0100 From: Damien Fleuriot <ml@my.gd> To: freebsd-stable@freebsd.org Subject: Re: Accidentally aborted upgrade via freebsd-update - how to recover? Message-ID: <4D1931FA.3070403@my.gd> In-Reply-To: <20101227225828.GB11955@lava.net> References: <20101227224426.GA11955@lava.net> <20101227224752.GC1505@eggman.experts-exchange.com> <20101227225828.GB11955@lava.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4D1931FA.3070403>