From owner-freebsd-stable@FreeBSD.ORG Thu Jun 18 08:35:00 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 A1A0B1065672 for ; Thu, 18 Jun 2009 08:35:00 +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 587BD8FC0C for ; Thu, 18 Jun 2009 08:35:00 +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 9D02F81BC06 for ; Thu, 18 Jun 2009 10:34:58 +0200 (CEST) Date: Thu, 18 Jun 2009 10:34:54 +0200 From: Erwan David To: freebsd-stable@freebsd.org Message-ID: <20090618083454.GQ5002@trusted-logic.com> Mail-Followup-To: freebsd-stable@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Republicain: 30 prairial an CCXVII (Chariot) 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: 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 08:35:00 -0000 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 ? Thank you. -- Erwan