From owner-freebsd-questions@FreeBSD.ORG  Sat Nov 17 14:27:28 2007
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 A2E4016A468
	for <freebsd-questions@freebsd.org>;
	Sat, 17 Nov 2007 14:27:28 +0000 (UTC)
	(envelope-from fbsd06+QK=b8e8f737@mlists.homeunix.com)
Received: from turtle-out.mxes.net (turtle-out.mxes.net [216.86.168.191])
	by mx1.freebsd.org (Postfix) with ESMTP id 7803513C442
	for <freebsd-questions@freebsd.org>;
	Sat, 17 Nov 2007 14:27:28 +0000 (UTC)
	(envelope-from fbsd06+QK=b8e8f737@mlists.homeunix.com)
Received: from mxout-04.mxes.net (mxout-04.mxes.net [216.86.168.179])
	by turtle-in.mxes.net (Postfix) with ESMTP id 06B94163F6C
	for <freebsd-questions@freebsd.org>;
	Sat, 17 Nov 2007 09:04:06 -0500 (EST)
Received: from gumby.homeunix.com. (unknown [87.81.140.128])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.mxes.net (Postfix) with ESMTP id A852DD05AC
	for <freebsd-questions@freebsd.org>;
	Sat, 17 Nov 2007 09:03:46 -0500 (EST)
Date: Sat, 17 Nov 2007 14:03:37 +0000
From: RW <fbsd06@mlists.homeunix.com>
To: freebsd-questions@freebsd.org
Message-ID: <20071117140337.513fb3e3@gumby.homeunix.com.>
In-Reply-To: <200711171116.06705.peter.schuller@infidyne.com>
References: <200711171116.06705.peter.schuller@infidyne.com>
X-Mailer: Claws Mail 3.0.2 (GTK+ 2.12.1; i386-portbld-freebsd6.2)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: sysutils/etcmerge vs 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: Sat, 17 Nov 2007 14:27:28 -0000

On Sat, 17 Nov 2007 11:15:58 +0100
Peter Schuller <peter.schuller@infidyne.com> wrote:

> Hello,
> 
> etcmerge, with three-way merging, has been available for a while, but
> the man page still warns of it not being extensively tested, and of
> course mergermaster still seems to be the officially supported tool.
> 
> In spite of this, etcmerge is attractive since, to be honest,
> manually saying "yes update" to a bunch of files that mostly have
> only CVS revision changes is a waste of time.

 Isn't that what the -U option in mergemaster does?  


   -U       Attempt to auto upgrade files that have not been user
                                                       modified.


BTW does  etcmerge handle the merging of passwd and groups well,
because that's what I hate more than anything else about upgrading.