From owner-freebsd-stable@FreeBSD.ORG Fri Jun 19 07:15:09 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 907641065679 for ; Fri, 19 Jun 2009 07:15:09 +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 4124A8FC0A for ; Fri, 19 Jun 2009 07:15:09 +0000 (UTC) (envelope-from erwan@rail.eu.org) Received: from trusted-logic.com (fbx.trusted-logic.com [88.160.136.44]) by depot.rail.eu.org (Postfix) with ESMTPSA id A6D9B81BCBC for ; Fri, 19 Jun 2009 09:15:07 +0200 (CEST) Date: Fri, 19 Jun 2009 09:15:05 +0200 From: Erwan David To: freebsd-stable@freebsd.org Message-ID: <20090619071505.GD13761@trusted-logic.com> Mail-Followup-To: freebsd-stable@freebsd.org References: <20090618083454.GQ5002@trusted-logic.com> <20090618123802.GA27215@ei.bzerk.org> <4A3B3683.8050908@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4A3B3683.8050908@FreeBSD.org> X-Republicain: 1 messidor an CCXVII (Seigle) User-Agent: Mutt/1.5.20 (2009-06-14) X-Virus-Scanned: clamav-milter 0.95.2 at nez-casse.depot.rail.eu.org X-Virus-Status: Clean 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: Fri, 19 Jun 2009 07:15:09 -0000 On Fri, Jun 19, 2009 at 08:56:03AM CEST, Doug Barton 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. -- Erwan