From owner-freebsd-hackers@FreeBSD.ORG  Wed Oct 23 00:15:18 2013
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 136E2E84
 for <freebsd-hackers@freebsd.org>; Wed, 23 Oct 2013 00:15:18 +0000 (UTC)
 (envelope-from schmiedgen@gmx.net)
Received: from mout.gmx.net (mout.gmx.net [212.227.17.22])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA (128/128 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A4196231D
 for <freebsd-hackers@freebsd.org>; Wed, 23 Oct 2013 00:15:17 +0000 (UTC)
Received: from pepe.smoke.local ([88.74.235.131]) by mail.gmx.com (mrgmx001)
 with ESMTPSA (Nemesis) id 0MPlY2-1Vcbqr2jcw-0053pc for
 <freebsd-hackers@freebsd.org>; Wed, 23 Oct 2013 02:15:15 +0200
Message-ID: <52671512.7000406@gmx.net>
Date: Wed, 23 Oct 2013 02:15:14 +0200
From: Michael Schmiedgen <schmiedgen@gmx.net>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:24.0) Gecko/20100101 Thunderbird/24.0
MIME-Version: 1.0
To: 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-Provags-ID: V03:K0:I8bQjNUYqEPOxkLE/WZ5FA8GwE+kgUJImgrJWR8x7frzpmmL62o
 GFiQFn2OiSw9WmZLkJytbOHaOERUjFakkFodElIzPtZ8BkEtvcjHoA+o4QZI5rjB7iZcGZa
 KutumjCRtNOTAGkiuO8JqyyW9WuGt8UaPkCVqkXGwzIwFT+l4e0ofHF2oLEK/1i8rLCkfRi
 exJSD3DFhbR7p3ES6hVyA==
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: Wed, 23 Oct 2013 00:15:18 -0000

On 10/01/13 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 #

Another thing was that I had to invoke pwd_mkdb manually after password
file was merged. I wondered, because behaviour in mergemaster is to
recognize this.

Michael