Date: Thu, 18 Jun 2009 23:56:03 -0700 From: Doug Barton <dougb@FreeBSD.org> To: Ruben de Groot <mail25@bzerk.org>, freebsd-stable@freebsd.org Subject: Re: Upgrade from 7.1-RELEASE to 7.2-RELEASE through freebsd update Message-ID: <4A3B3683.8050908@FreeBSD.org> In-Reply-To: <20090618123802.GA27215@ei.bzerk.org> References: <20090618083454.GQ5002@trusted-logic.com> <20090618123802.GA27215@ei.bzerk.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Ruben de Groot wrote:
> On Thu, Jun 18, 2009 at 10:34:54AM +0200, Erwan David typed:
>> I tried to upgrade my 7.1-RELEASE into 7.2-RELEASE. However
>> freebsd-update kept asking me to merge every file in /etc whose $Id$
>> line changed (that makes about all files).
>>
>> Is there a way, as with mergemaster, to make it not consider the $Id$
>> line for the manual merge ?
Step 1, 'man mergemaster' :)
Step 2, pay special attention to the -F option
Step 3, pay more special attention to the -U option
But seriously folks, run 'mergemaster -Fi' once, then run
'mergemaster -U'. (And seriously read the man page.)
hope this helps,
Doug
--
This .signature sanitized for your protection
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A3B3683.8050908>