From owner-freebsd-questions@FreeBSD.ORG  Tue Jan 10 14:06:36 2012
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 96F88106564A
	for <freebsd-questions@freebsd.org>;
	Tue, 10 Jan 2012 14:06:36 +0000 (UTC) (envelope-from martin@925.dk)
Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54])
	by mx1.freebsd.org (Postfix) with ESMTP id 35D988FC26
	for <freebsd-questions@freebsd.org>;
	Tue, 10 Jan 2012 14:06:35 +0000 (UTC)
Received: by eekd49 with SMTP id d49so231037eek.13
	for <freebsd-questions@freebsd.org>;
	Tue, 10 Jan 2012 06:06:35 -0800 (PST)
Received: by 10.213.31.196 with SMTP id z4mr3957936ebc.142.1326202622126;
	Tue, 10 Jan 2012 05:37:02 -0800 (PST)
Received: from [10.0.1.4] ([90.185.151.99])
	by mx.google.com with ESMTPS id 76sm304379064eeh.0.2012.01.10.05.37.00
	(version=TLSv1/SSLv3 cipher=OTHER);
	Tue, 10 Jan 2012 05:37:01 -0800 (PST)
From: Martin Koch Andersen <martin@925.dk>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: quoted-printable
Date: Tue, 10 Jan 2012 14:36:59 +0100
Message-Id: <6D57A974-1235-461E-A164-DBFC798A8560@925.dk>
To: freebsd-questions@freebsd.org
Mime-Version: 1.0 (Apple Message framework v1251.1)
X-Mailer: Apple Mail (2.1251.1)
Subject: freebsd-update auto merge fails on trivial VC lines
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jan 2012 14:06:36 -0000

Hello,

When upgrading from FreeBSD 8.2-RELEASE to 9.0-RELEASE using =
freebsd-update, I'm asked to merge, what seems like, everything in /etc =
manually.
And all of the merges are trivial version controls lines.

E.g. my /etc/amd.map (which I never modified) begins with:

# $FreeBSD: releng/8.2/etc/amd.map 164015 2006-11-06 01:42:11Z obrien $

And this file (and line) freebsd-update asks me to manually merge. I =
wonder why that is.

Kind regards,

--=20
Martin Koch Andersen
http://925.dk=