From owner-freebsd-stable@FreeBSD.ORG Thu Jun 18 18:09:17 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7DD8106564A for ; Thu, 18 Jun 2009 18:09:17 +0000 (UTC) (envelope-from erwan@rail.eu.org) Received: from depot.rail.eu.org (cl-23.mrs-01.fr.sixxs.net [IPv6:2a01:240:fe00:16::2]) by mx1.freebsd.org (Postfix) with ESMTP id 9AC0E8FC15 for ; Thu, 18 Jun 2009 18:09:17 +0000 (UTC) (envelope-from erwan@rail.eu.org) Received: from rail.eu.org (unknown [IPv6:2a01:240:fe0f:0:21e:c2ff:fe9c:2f23]) by depot.rail.eu.org (Postfix) with ESMTPSA id 26CA181BC06; Thu, 18 Jun 2009 20:09:16 +0200 (CEST) Date: Thu, 18 Jun 2009 20:09:15 +0200 From: Erwan David To: freebsd-stable@freebsd.org Message-ID: <20090618180914.GA49300@rail.eu.org> Mail-Followup-To: freebsd-stable@freebsd.org, Ruben de Groot References: <20090618083454.GQ5002@trusted-logic.com> <20090618123802.GA27215@ei.bzerk.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090618123802.GA27215@ei.bzerk.org> X-Republicain: 30 prairial an CCXVII (Chariot) User-Agent: Mutt/1.5.19 (2009-01-05) X-Virus-Scanned: clamav-milter 0.95.2 at nez-casse.depot.rail.eu.org X-Virus-Status: Clean Cc: Ruben de Groot Subject: Re: Upgrade from 7.1-RELEASE to 7.2-RELEASE through freebsd update X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jun 2009 18:09:18 -0000 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