From owner-freebsd-questions@FreeBSD.ORG  Fri Feb 18 13:25:52 2011
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 A73D5106566C
	for <freebsd-questions@freebsd.org>;
	Fri, 18 Feb 2011 13:25:52 +0000 (UTC)
	(envelope-from freebsd-questions-local@be-well.ilk.org)
Received: from mail2.sea5.speakeasy.net (mail2.sea5.speakeasy.net
	[69.17.117.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7E2BD8FC19
	for <freebsd-questions@freebsd.org>;
	Fri, 18 Feb 2011 13:25:52 +0000 (UTC)
Received: (qmail 20702 invoked from network); 18 Feb 2011 13:25:51 -0000
Received: from dsl092-078-145.bos1.dsl.speakeasy.net (HELO be-well.ilk.org)
	([66.92.78.145])
	(envelope-sender <freebsd-questions-local@be-well.ilk.org>)
	by mail2.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP
	for <freebsd-questions@freebsd.org>; 18 Feb 2011 13:25:51 -0000
Received: by be-well.ilk.org (Postfix, from userid 1147)
	id B56C25082A; Fri, 18 Feb 2011 08:25:49 -0500 (EST)
From: Lowell Gilbert <freebsd-questions-local@be-well.ilk.org>
To: David Demelier <demelier.david@gmail.com>
References: <4D5CCB72.20505@gmail.com>
Date: Fri, 18 Feb 2011 08:25:49 -0500
In-Reply-To: <4D5CCB72.20505@gmail.com> (David Demelier's message of "Thu, 17
	Feb 2011 08:17:06 +0100")
Message-ID: <44ei75xyn6.fsf@be-well.ilk.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: freebsd-questions@freebsd.org
Subject: Re: mergemaster -U ask for a lot non-user modified files
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-questions@freebsd.org
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: Fri, 18 Feb 2011 13:25:52 -0000

David Demelier <demelier.david@gmail.com> writes:

> Hello,
>
> Each time I run mergemaster -UiF, it asks for a lot of file that I do
> not have modified such as /dev/rc.d/* and /etc/defaults/*
>
>
> ======================================================================
>
>
>   Use 'd' to delete the temporary ./etc/network.subr
>   Use 'i' to install the temporary ./etc/network.subr
>   Use 'm' to merge the temporary and installed versions
>   Use 'v' to view the diff results again
>
>   Default is to leave the temporary file to deal with by hand
>
> How should I deal with this? [Leave it for later]
>
> I never touched this file! Why it asks me to install the new one?

You're probably having problems with the mtree database that mergemaster
uses for that.  I think by default it's /var/db/mergemaster.mtree.