Date: Fri, 19 Jun 2009 15:00:45 +0200 From: Erwan David <erwan@rail.eu.org> To: freebsd-stable@freebsd.org Subject: Re: Upgrade from 7.1-RELEASE to 7.2-RELEASE through freebsd update Message-ID: <20090619130045.GA21430@trusted-logic.com> In-Reply-To: <20090619071505.GD13761@trusted-logic.com> References: <20090618083454.GQ5002@trusted-logic.com> <20090618123802.GA27215@ei.bzerk.org> <4A3B3683.8050908@FreeBSD.org> <20090619071505.GD13761@trusted-logic.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Jun 19, 2009 at 09:15:05AM CEST, Erwan David <erwan@rail.eu.org> said: > On Fri, Jun 19, 2009 at 08:56:03AM CEST, Doug Barton <dougb@FreeBSD.org> said: > > 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.) > > freebsd-update does not use mergemaster, that's a part of the > problem. With more details : freebsd update does this in a special merge directory, using merge(1) which does not have the -I option. mergemaster is not anoption since the file layout is not the same. -- Erwan
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090619130045.GA21430>