From nobody@FreeBSD.org  Tue Jun 16 19:05:32 2009
Return-Path: <nobody@FreeBSD.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
Subject: freebsd-update : forces manual merge of every file in /etc
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         135647
>Category:       bin
>Synopsis:       freebsd-update(8): forces manual merge of every file in /etc
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    cperciva
>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:  Sun Sep  5 10:10:02 UTC 2010
>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:
Responsible-Changed-From-To: freebsd-bugs->cperciva 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Jun 16 23:33:56 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135647 

From: Alex Samorukov <samm@os2.kiev.ua>
To: bug-followup@FreeBSD.org, erwan@rail.eu.org
Cc:  
Subject: Re: bin/135647: freebsd-update(8): forces manual merge of every file
 in /etc
Date: Sun, 05 Sep 2010 12:03:55 +0200

 I have the same issues while updating from 7.2 to 7.3.
>Unformatted:
