From owner-svn-src-head@FreeBSD.ORG  Fri Jan  2 23:34:32 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 21DB91065700;
	Fri,  2 Jan 2009 23:34:32 +0000 (UTC)
	(envelope-from xi@borderworlds.dk)
Received: from kazon.borderworlds.dk (kazon.borderworlds.dk [213.239.213.48])
	by mx1.freebsd.org (Postfix) with ESMTP id D05D88FC16;
	Fri,  2 Jan 2009 23:34:31 +0000 (UTC)
	(envelope-from xi@borderworlds.dk)
Received: from dominion.borderworlds.dk (localhost [127.0.0.1])
	by kazon.borderworlds.dk (Postfix) with ESMTP id D4102170A8;
	Sat,  3 Jan 2009 00:19:02 +0100 (CET)
Received: by dominion.borderworlds.dk (Postfix, from userid 2000)
	id 8393047C; Sat,  3 Jan 2009 00:19:02 +0100 (CET)
To: Garrett Wollman <wollman@bimajority.org>
References: <200901011055.n01AtQaN052763@svn.freebsd.org>
	<495DB15B.8040908@FreeBSD.org> <495DB9B6.4030801@FreeBSD.org>
	<495DC5AF.3050908@FreeBSD.org> <495E91F8.3010706@FreeBSD.org>
	<18782.37537.775290.682466@hergotha.csail.mit.edu>
From: Christian Laursen <xi@borderworlds.dk>
Date: Sat, 03 Jan 2009 00:19:02 +0100
In-Reply-To: <18782.37537.775290.682466@hergotha.csail.mit.edu> (Garrett
	Wollman's message of "Fri\, 2 Jan 2009 17\:18\:09 -0500")
Message-ID: <ygfeizlb8k9.fsf@dominion.borderworlds.dk>
User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
	Doug Barton <dougb@FreeBSD.org>, src-committers@FreeBSD.org
Subject: Re: svn: head/usr.sbin/mergemaster
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jan 2009 23:34:32 -0000

Garrett Wollman <wollman@bimajority.org> writes:

> It would be much better if the options that *nearly every user will
> want to use* are set correctly by default.  I have to look at the man
> page every time I update a system to remind myself what is that magic
> option that makes mergemaster do the right thing with files I haven't
> changed.

I agree that auto-install and auto-upgrade would be nice to have on by
default.

However, mergemaster has a configuration file so you actually only
need to make things right once for every system.

cat > /etc/mergemaster.rc
AUTO_INSTALL=yes
AUTO_UPGRADE=yes
^d

-- 
Christian Laursen