From owner-freebsd-stable@FreeBSD.ORG  Fri Jun 19 06:56:09 2009
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
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 ACD881065674
	for <freebsd-stable@freebsd.org>; Fri, 19 Jun 2009 06:56:09 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4])
	by mx1.freebsd.org (Postfix) with ESMTP id 3DFDE8FC19
	for <freebsd-stable@freebsd.org>; Fri, 19 Jun 2009 06:56:09 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: (qmail 22216 invoked by uid 399); 19 Jun 2009 06:56:05 -0000
Received: from localhost (HELO foreign.dougb.net)
	(dougb@dougbarton.us@127.0.0.1)
	by localhost with ESMTPAM; 19 Jun 2009 06:56:05 -0000
X-Originating-IP: 127.0.0.1
X-Sender: dougb@dougbarton.us
Message-ID: <4A3B3683.8050908@FreeBSD.org>
Date: Thu, 18 Jun 2009 23:56:03 -0700
From: Doug Barton <dougb@FreeBSD.org>
Organization: http://www.FreeBSD.org/
User-Agent: Thunderbird 2.0.0.21 (X11/20090423)
MIME-Version: 1.0
To: Ruben de Groot <mail25@bzerk.org>, freebsd-stable@freebsd.org
References: <20090618083454.GQ5002@trusted-logic.com>
	<20090618123802.GA27215@ei.bzerk.org>
In-Reply-To: <20090618123802.GA27215@ei.bzerk.org>
X-Enigmail-Version: 0.95.7
OpenPGP: id=D5B2F0FB
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: 
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 <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Jun 2009 06:56:10 -0000

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.)


hope this helps,

Doug

-- 

    This .signature sanitized for your protection