From owner-freebsd-stable@FreeBSD.ORG  Thu Jun 18 12:38:07 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 A33EE1065674
	for <freebsd-stable@freebsd.org>; Thu, 18 Jun 2009 12:38:07 +0000 (UTC)
	(envelope-from mail25@bzerk.org)
Received: from ei.bzerk.org (tunnel490.ipv6.xs4all.nl
	[IPv6:2001:888:10:1ea::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 327C58FC22
	for <freebsd-stable@freebsd.org>; Thu, 18 Jun 2009 12:38:06 +0000 (UTC)
	(envelope-from mail25@bzerk.org)
Received: from ei.bzerk.org (BOFH@localhost [127.0.0.1])
	by ei.bzerk.org (8.14.2/8.14.2) with ESMTP id n5ICc3iF027314
	for <freebsd-stable@freebsd.org>; Thu, 18 Jun 2009 14:38:03 +0200 (CEST)
	(envelope-from mail25@bzerk.org)
Received: (from bulk@localhost)
	by ei.bzerk.org (8.14.2/8.14.2/Submit) id n5ICc35g027313
	for freebsd-stable@freebsd.org; Thu, 18 Jun 2009 14:38:03 +0200 (CEST)
	(envelope-from mail25@bzerk.org)
Date: Thu, 18 Jun 2009 14:38:02 +0200
From: Ruben de Groot <mail25@bzerk.org>
To: freebsd-stable@freebsd.org
Message-ID: <20090618123802.GA27215@ei.bzerk.org>
Mail-Followup-To: Ruben de Groot <mail25@bzerk.org>, freebsd-stable@freebsd.org
References: <20090618083454.GQ5002@trusted-logic.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20090618083454.GQ5002@trusted-logic.com>
User-Agent: Mutt/1.4.2.3i
X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED autolearn=failed
	version=3.2.5
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on ei.bzerk.org
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1
	(ei.bzerk.org [127.0.0.1]); Thu, 18 Jun 2009 14:38:05 +0200 (CEST)
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: Thu, 18 Jun 2009 12:38:08 -0000

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