From owner-svn-src-head@FreeBSD.ORG  Fri Jan  2 22:52:07 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 E493A106564A;
	Fri,  2 Jan 2009 22:52:07 +0000 (UTC)
	(envelope-from wollman@hergotha.csail.mit.edu)
Received: from hergotha.csail.mit.edu (hergotha.csail.mit.edu [66.92.79.170])
	by mx1.freebsd.org (Postfix) with ESMTP id 887A98FC1C;
	Fri,  2 Jan 2009 22:52:01 +0000 (UTC)
	(envelope-from wollman@hergotha.csail.mit.edu)
Received: from hergotha.csail.mit.edu (localhost [127.0.0.1])
	by hergotha.csail.mit.edu (8.14.2/8.14.2) with ESMTP id n02MI9OM019748; 
	Fri, 2 Jan 2009 17:18:09 -0500 (EST)
	(envelope-from wollman@hergotha.csail.mit.edu)
Received: (from wollman@localhost)
	by hergotha.csail.mit.edu (8.14.2/8.13.8/Submit) id n02MI953019745;
	Fri, 2 Jan 2009 17:18:09 -0500 (EST) (envelope-from wollman)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <18782.37537.775290.682466@hergotha.csail.mit.edu>
Date: Fri, 2 Jan 2009 17:18:09 -0500
From: Garrett Wollman <wollman@bimajority.org>
To: Doug Barton <dougb@FreeBSD.org>
In-Reply-To: <495E91F8.3010706@FreeBSD.org>
References: <200901011055.n01AtQaN052763@svn.freebsd.org>
	<495DB15B.8040908@FreeBSD.org> <495DB9B6.4030801@FreeBSD.org>
	<495DC5AF.3050908@FreeBSD.org> <495E91F8.3010706@FreeBSD.org>
X-Mailer: VM 7.17 under 21.4 (patch 21) "Educational Television" XEmacs Lucid
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0
	(hergotha.csail.mit.edu [127.0.0.1]);
	Fri, 02 Jan 2009 17:18:10 -0500 (EST)
X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED
	autolearn=disabled version=3.2.5
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	hergotha.csail.mit.edu
Cc: svn-src-head@FreeBSD.org, svn-src-all@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 22:52:08 -0000

<<On Fri, 02 Jan 2009 14:15:20 -0800, Doug Barton <dougb@FreeBSD.org> said:

> As I said in my first post, if there is overwhelming demand for this
> down the road that is not met by the existing solutions I'll consider
> adding a better implementation as an option, off by default.

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.

-GAWollman