From owner-freebsd-questions@FreeBSD.ORG  Sun Nov 18 17:40:26 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 834A416A46D
	for <freebsd-questions@freebsd.org>;
	Sun, 18 Nov 2007 17:40:26 +0000 (UTC)
	(envelope-from fbsd06+QL=6abbd0bf@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 5980E13C457
	for <freebsd-questions@freebsd.org>;
	Sun, 18 Nov 2007 17:40:26 +0000 (UTC)
	(envelope-from fbsd06+QL=6abbd0bf@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 5FB6F163F7B
	for <freebsd-questions@freebsd.org>;
	Sun, 18 Nov 2007 12:17:49 -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 CFA4ED0501
	for <freebsd-questions@freebsd.org>;
	Sun, 18 Nov 2007 12:17:38 -0500 (EST)
Date: Sun, 18 Nov 2007 17:17:36 +0000
From: RW <fbsd06@mlists.homeunix.com>
To: freebsd-questions@freebsd.org
Message-ID: <20071118171736.6db678b6@gumby.homeunix.com.>
In-Reply-To: <200711181302.05161.peter.schuller@infidyne.com>
References: <200711171116.06705.peter.schuller@infidyne.com>
	<20071117140337.513fb3e3@gumby.homeunix.com.>
	<200711181302.05161.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: Sun, 18 Nov 2007 17:40:26 -0000

On Sun, 18 Nov 2007 13:01:56 +0100
Peter Schuller <peter.schuller@infidyne.com> wrote:

> >  Isn't that what the -U option in mergemaster does?
> >
> >
> >    -U       Attempt to auto upgrade files that have not been user
> >                                                        modified.
> 
> I believe I tried this once and it did not make a difference, but I
> didn't investigate. Perhaps I screwed up.

It's something I only noticed on the 6.2 upgrade, and I've never
actually used.  It seems to work by comparing hashes of installed files
with the cvs versions from the previous run. I guess it doesn't work on
the first upgrade as there's no stored database.