Date: Thu, 18 Jun 2009 20:09:15 +0200 From: Erwan David <erwan@rail.eu.org> To: freebsd-stable@freebsd.org Cc: Ruben de Groot <mail25@bzerk.org> Subject: Re: Upgrade from 7.1-RELEASE to 7.2-RELEASE through freebsd update Message-ID: <20090618180914.GA49300@rail.eu.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
Le Thu 18/06/2009, Ruben de Groot disait > 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 I do not master enough either freebsd-update nor mergemaster to tell the former not to do the merge, but only download what is necessary for the latter to work. If I understand well, I can tell not to touch /etc (removing it from MergeChanges), but I would not be able to find what is then needed for mergemaster. -- Erwan
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090618180914.GA49300>