Date: Thu, 18 Jun 2009 14:38:02 +0200 From: Ruben de Groot <mail25@bzerk.org> To: freebsd-stable@freebsd.org Subject: Re: Upgrade from 7.1-RELEASE to 7.2-RELEASE through freebsd update Message-ID: <20090618123802.GA27215@ei.bzerk.org> In-Reply-To: <20090618083454.GQ5002@trusted-logic.com> References: <20090618083454.GQ5002@trusted-logic.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 ? You could let freebsd-update ignore /etc (but not /usr/src) and use mergemaster for your configuration files. Ruben
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090618123802.GA27215>