From owner-freebsd-hackers@FreeBSD.ORG  Tue Oct  1 09:33:54 2013
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B6AFC4F2
 for <freebsd-hackers@freebsd.org>; Tue,  1 Oct 2013 09:33:54 +0000 (UTC)
 (envelope-from uffe@uffe.org)
Received: from mail.starion.dk (mx0.starion.dk [93.162.70.34])
 by mx1.freebsd.org (Postfix) with SMTP id 093562B26
 for <freebsd-hackers@freebsd.org>; Tue,  1 Oct 2013 09:33:52 +0000 (UTC)
Received: (qmail 66103 invoked by uid 1004); 1 Oct 2013 09:33:48 -0000
Message-ID: <524A96F4.5060205@uffe.org>
Date: Tue, 01 Oct 2013 11:33:40 +0200
From: Uffe Jakobsen <uffe@uffe.org>
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
 rv:24.0) Gecko/20100101 Thunderbird/24.0
MIME-Version: 1.0
To: freebsd-hackers <freebsd-hackers@freebsd.org>
Subject: Re: Is freebsd-update braindamaged, or I'm using it wrong?
References: <CAF-QHFUjfsepwuGnBAhL6x=HYznPj3Cj+6fX_O36s8U6C7b7Nw@mail.gmail.com>
In-Reply-To: <CAF-QHFUjfsepwuGnBAhL6x=HYznPj3Cj+6fX_O36s8U6C7b7Nw@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
 <freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-hackers>, 
 <mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
 <mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Oct 2013 09:33:54 -0000



On 2013-10-01 11:16, Ivan Voras wrote:
> This is the first time I've used freebsd-update in years, and I'm
> immediately flagging it as something I won't use in the future. For
> the last half hour it has been forcing me to manually resolve, one by
> one, in an editor, hundreds of "merge conflicts" such as these:
>
>    1 <<<<<<< current version
>    2 # $FreeBSD: release/9.0.0/etc/gettytab 209954 2010-07-12 19:09:18Z bcr $
>    3 =======
>    4 # $FreeBSD: release/9.2.0/etc/gettytab 243623 2012-11-27 19:23:54Z peterj $
>    5 >>>>>>> 9.2-RELEASE
>    6 #       from: @(#)gettytab      5.14 (Berkeley) 3/27/91
>    7 #
>

I've had the same expierience during some upgrades.
I've never been able to find the exact reason.
But my theory is that the mergemaster reacts on some specific settings 
on the affected systems - it be env or config files.

Unfortunately I've reinstalled the affected system (in rage) so further 
bug hunting is not possible. On newer installs the problem has not shown 
up...

/Uffe