From owner-freebsd-questions@FreeBSD.ORG  Thu Feb 17 07:17:39 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 887E9106564A
	for <freebsd-questions@freebsd.org>;
	Thu, 17 Feb 2011 07:17:39 +0000 (UTC)
	(envelope-from demelier.david@gmail.com)
Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com
	[209.85.161.54])
	by mx1.freebsd.org (Postfix) with ESMTP id 189AC8FC1F
	for <freebsd-questions@freebsd.org>;
	Thu, 17 Feb 2011 07:17:38 +0000 (UTC)
Received: by fxm16 with SMTP id 16so2216278fxm.13
	for <freebsd-questions@freebsd.org>;
	Wed, 16 Feb 2011 23:17:37 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:message-id:date:from:user-agent:mime-version:to
	:subject:content-type:content-transfer-encoding;
	bh=24U1wjFQBUS9/dWuk3AUcbtT12sayRyVkX86h6zEujw=;
	b=WrTwwPbfvWNGF5QiyML/C0/Q6fM8UW7u2NSbU2Jsz2KzsBKuRJYt69mZPiHAhwvy21
	JR9314y6fzOP/J3/LY52fFkPmgz5gyUAt1pnefD4Z0+rT8XS39r5sRnogrhmmWhVVk7e
	ybzrUdVSk9OKUwsv+dI9XPkQ8bzsmmntrfDqw=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=message-id:date:from:user-agent:mime-version:to:subject
	:content-type:content-transfer-encoding;
	b=p4fXqxuBXPzyPhhTk+9cMRs8rYdPCZ82ATgvLxOPizW1YdEZ7FbPnElqFAOwOcxE+/
	ukZdjeomx1lcRqTL/vYyV+9dVXbMkVUUBdsGMCnqhxz4pTZmRgLRndwk7hIc7zTBCsq2
	ikqpFsgusSVrpp2FyRWgkWah8qxAxgR7CEpYc=
Received: by 10.223.71.195 with SMTP id i3mr1930202faj.149.1297927057890;
	Wed, 16 Feb 2011 23:17:37 -0800 (PST)
Received: from Melon.malikania.fr (wifi-osiris-sec-181-113.u-strasbg.fr
	[130.79.181.113])
	by mx.google.com with ESMTPS id e6sm264682fav.32.2011.02.16.23.17.36
	(version=SSLv3 cipher=OTHER); Wed, 16 Feb 2011 23:17:36 -0800 (PST)
Message-ID: <4D5CCB72.20505@gmail.com>
Date: Thu, 17 Feb 2011 08:17:06 +0100
From: David Demelier <demelier.david@gmail.com>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US;
	rv:1.9.2.13) Gecko/20110125 Thunderbird/3.1.7
MIME-Version: 1.0
To: freebsd-questions@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: mergemaster -U ask for a lot non-user modified files
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: Thu, 17 Feb 2011 07:17:39 -0000

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?

Cheers,

-- 
David Demelier