From owner-freebsd-questions@FreeBSD.ORG  Sun Sep  7 02:24:50 2008
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 3B603106564A
	for <freebsd-questions@freebsd.org>;
	Sun,  7 Sep 2008 02:24:50 +0000 (UTC)
	(envelope-from jeffrey@goldmark.org)
Received: from out1.smtp.messagingengine.com (out1.smtp.messagingengine.com
	[66.111.4.25]) by mx1.freebsd.org (Postfix) with ESMTP id 15A968FC20
	for <freebsd-questions@freebsd.org>;
	Sun,  7 Sep 2008 02:24:49 +0000 (UTC)
	(envelope-from jeffrey@goldmark.org)
Received: from compute1.internal (compute1.internal [10.202.2.41])
	by out1.messagingengine.com (Postfix) with ESMTP id 0998B15D365
	for <freebsd-questions@freebsd.org>;
	Sat,  6 Sep 2008 22:24:49 -0400 (EDT)
Received: from heartbeat1.messagingengine.com ([10.202.2.160])
	by compute1.internal (MEProxy); Sat, 06 Sep 2008 22:24:49 -0400
X-Sasl-enc: 9yTMlE+2jat+FKQNAnWGLhjNgVfVL0bYWaUYjendwUgg 1220754288
Received: from hagrid.ewd.goldmark.org (n114.ewd.goldmark.org [72.64.118.114])
	by mail.messagingengine.com (Postfix) with ESMTPSA id 8E939BCC2
	for <freebsd-questions@freebsd.org>;
	Sat,  6 Sep 2008 22:24:48 -0400 (EDT)
Message-Id: <EAC94C27-E408-4B38-9484-671B598BB034@goldmark.org>
From: Jeffrey Goldberg <jeffrey@goldmark.org>
To: freebsd-questions@freebsd.org
In-Reply-To: <ygf1vzx2l2g.fsf@dominion.borderworlds.dk>
Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0 (Apple Message framework v928.1)
Date: Sat, 6 Sep 2008 21:24:46 -0500
References: <fb6605670809061028s680b3fffk9f435f8a150eb99d@mail.gmail.com>
	<ygf1vzx2l2g.fsf@dominion.borderworlds.dk>
X-Mailer: Apple Mail (2.928.1)
Subject: Re: alternatives to mergemaster
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, 07 Sep 2008 02:24:50 -0000

On Sep 6, 2008, at 1:20 PM, Christian Laursen wrote:

> I always run mergemaster in auto upgrade mode. From the man page:
>
> -U          Attempt to auto upgrade files that have not been user  
> modi-
>            fied.
>
> This can also be achieved by putting "AUTO_UPGRADE=yes" in
> /etc/mergemaster.rc.

AUTO_UPGRADE isn't documented in mergemaster(8).

I guess it's time for me to submit my first documentation patch  
(unless someone beats me to it).

Cheers,

-j



-- 
Jeffrey Goldberg                        http://www.goldmark.org/jeff/