From owner-freebsd-bugs@FreeBSD.ORG  Tue Jun 16 19:10:03 2009
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5EBA61065674
	for <freebsd-bugs@hub.freebsd.org>;
	Tue, 16 Jun 2009 19:10:03 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FD7A8FC1A
	for <freebsd-bugs@hub.freebsd.org>;
	Tue, 16 Jun 2009 19:10:03 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5GJA30m005778
	for <freebsd-bugs@freefall.freebsd.org>; Tue, 16 Jun 2009 19:10:03 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5GJA2Wo005777;
	Tue, 16 Jun 2009 19:10:02 GMT (envelope-from gnats)
Resent-Date: Tue, 16 Jun 2009 19:10:02 GMT
Resent-Message-Id: <200906161910.n5GJA2Wo005777@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	Erwan David <erwan@rail.eu.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A580D1065679
	for <freebsd-gnats-submit@FreeBSD.org>;
	Tue, 16 Jun 2009 19:05:32 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 940C78FC24
	for <freebsd-gnats-submit@FreeBSD.org>;
	Tue, 16 Jun 2009 19:05:32 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n5GJ5WoE018931
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 16 Jun 2009 19:05:32 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n5GJ5VC2018930;
	Tue, 16 Jun 2009 19:05:31 GMT (envelope-from nobody)
Message-Id: <200906161905.n5GJ5VC2018930@www.freebsd.org>
Date: Tue, 16 Jun 2009 19:05:31 GMT
From: Erwan David <erwan@rail.eu.org>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Cc: 
Subject: misc/135647: freebsd-update : forces manual merge of every file in
	/etc
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Jun 2009 19:10:03 -0000


>Number:         135647
>Category:       misc
>Synopsis:       freebsd-update : forces manual merge of every file in /etc
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 16 19:10:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Erwan David
>Release:        7.1-Release-p4
>Organization:
>Environment:
FreeBSD nez-casse.depot.rail.eu.org 7.1-RELEASE-p4 FreeBSD 7.1-RELEASE-p4 #0: Sun Mar 22 09:43:46 UTC 2009     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
When trying to upgrade to 7.2 by using
 freebsd-update upgrade -r 7.2-RELEASE
When doing the merge phase of config files, freebsd-update finds every file to be in conflict and so launches $EDITOR file by file for each one, because of the changed Id.

It makes the method practically unusable to upgrade.
>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
>Unformatted: