From owner-freebsd-stable@FreeBSD.ORG  Tue Dec 11 06:55:20 2012
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3A31BE88
 for <freebsd-stable@freebsd.org>; Tue, 11 Dec 2012 06:55:20 +0000 (UTC)
 (envelope-from b.smeelen@ose.nl)
Received: from mail.ose.nl (mail.ose.nl [212.178.134.164])
 by mx1.freebsd.org (Postfix) with ESMTP id BFAA48FC13
 for <freebsd-stable@freebsd.org>; Tue, 11 Dec 2012 06:55:19 +0000 (UTC)
X-Footer: b3NlLm5s
Received: from localhost ([127.0.0.1]) by mail.ose.nl
 (using TLSv1/SSLv3 with cipher AES256-SHA (256 bits))
 for freebsd-stable@freebsd.org; Tue, 11 Dec 2012 07:55:17 +0100
Message-ID: <50C6D8D3.9020106@ose.nl>
Date: Tue, 11 Dec 2012 07:55:15 +0100
From: Bas Smeelen <b.smeelen@ose.nl>
User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/17.0 Thunderbird/17.0
MIME-Version: 1.0
To: freebsd-stable@freebsd.org
Subject: Re: freebsd-update mergemaster options
References: <612DB7D4-07CA-4C48-98F8-081C33E85812@develooper.com>
In-Reply-To: <612DB7D4-07CA-4C48-98F8-081C33E85812@develooper.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 06:55:20 -0000

On 12/11/2012 12:58 AM, Ask Bjørn Hansen wrote:
> Hi,
>
> On an 8.2 box, I run
>
> freebsd-update -r 8.3-RELEASE upgrade
>
> I am getting hundreds of files with "conflicts" like:
>
> <<<<<<< current version
> # $FreeBSD: src/etc/auth.conf,v 1.6.32.1.4.1 2010/06/14 02:09:06 kensmith Exp $
> =======
> # $FreeBSD: src/etc/auth.conf,v 1.6.32.1.8.1 2012/03/03 06:15:13 kensmith Exp $

I don't know why this happens. Upgrading a couple of boxes from 8.1-RELEASE 
to 8.3-RELEASE did not give me these conflicts.
As far as I know freebsd-update does not use mergemaster.rc, just 
freebsd-update.conf

It might be the case that you have upgraded from source before on this 
machine that causes this situation?

>>>>>>>> 8.3-RELEASE
> ... which is just tremendously unhelpful. I'm using the default freebsd-update configuration. Per an old mail from the archives I made sure I have /etc/mergemaster.rc setup as below, but it doesn't seem to make a difference.
>
> Any ideas?  In the past I've just given up on using freebsd-update and gone back to manually compiling and installing world, but for this box I'd really like not to.
>
>
> Ask
>
> $ cat /etc/mergemaster.rc
> # Automatically install files that do not exist
> AUTO_INSTALL='yes'
> # Automatically upgrade files that have not been edited
> AUTO_UPGRADE='yes'
> # Ignore files that I don't want changed
> IGNORE_FILES='/etc/motd'
> # Do not display changes that only affect whitespace
> DIFF_FLAG="'.Bub'"
> # Ignore CVS id lines to stop replacing files where only that line has changed
> DIFF_OPTIONS='-I$FreeBSD:.*[$]'