From owner-freebsd-questions@FreeBSD.ORG  Sun Nov  6 19:30:45 2011
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 74508106566C
	for <freebsd-questions@freebsd.org>;
	Sun,  6 Nov 2011 19:30:45 +0000 (UTC) (envelope-from feld@feld.me)
Received: from mwi1.coffeenet.org (unknown [IPv6:2607:f4e0:100:300::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 24C168FC18
	for <freebsd-questions@freebsd.org>;
	Sun,  6 Nov 2011 19:30:45 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=feld.me;
	s=blargle; 
	h=In-Reply-To:Message-Id:From:Mime-Version:Date:References:Subject:To:Content-Type;
	bh=BaXPc/jSVyKcA23p81f10fOlZen+SfGXYxusVnCjEGo=; 
	b=YTfMnd5pbbaLNy/8LWAceCCkI51Y2TwxKy9I3eVa9Bxm8eQtoUGTvKH9k92pggpTlaG4DtZUXhTIfRh/gVDtd4H2TJwn002VORYvkiL7q9B2+uFnkKcHdLz9HAtG+/kC;
Received: from localhost ([127.0.0.1] helo=mwi1.coffeenet.org)
	by mwi1.coffeenet.org with esmtp (Exim 4.76 (FreeBSD))
	(envelope-from <feld@feld.me>) id 1RN8QV-000Bf4-BM
	for freebsd-questions@freebsd.org; Sun, 06 Nov 2011 13:30:44 -0600
Received: from feld@feld.me by mwi1.coffeenet.org (Archiveopteryx 3.1.4)
	with esmtpsa id 1320607837-84560-84558/5/15; Sun, 6 Nov 2011 19:30:37
	+0000
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes
To: freebsd-questions@freebsd.org
References: <867h3ddped.fsf@red.stonehenge.com>
Date: Sun, 6 Nov 2011 13:30:36 -0600
Mime-Version: 1.0
From: Mark Felder <feld@feld.me>
Message-Id: <op.v4jhtaiq34t2sn@cr48.lan>
In-Reply-To: <867h3ddped.fsf@red.stonehenge.com>
User-Agent: Opera Mail/11.52 (Linux)
X-SA-Score: -1.0
Subject: Re: painful binary upgrade from 8.1 to 8.2
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Nov 2011 19:30:45 -0000

On Sun, 06 Nov 2011 13:25:30 -0600, Randal L. Schwartz  
<merlyn@stonehenge.com> wrote:
>
> Why doesn't the freebsd-update command invoke mergemaster with -F?
>
> Or is there some step that I'm leaving out?
>

Does freebsd-update follow /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:.*[$]'


This is precisely why I still do source upgrades most of the time. But I  
haven't tried since I started using mergemaster.rc.



Regards,


Mark