From owner-freebsd-questions@FreeBSD.ORG  Wed Feb 23 22:14:45 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 654561065672
	for <freebsd-questions@freebsd.org>;
	Wed, 23 Feb 2011 22:14:45 +0000 (UTC)
	(envelope-from freebsd-questions-local@be-well.ilk.org)
Received: from mail8.sea5.speakeasy.net (mail8.sea5.speakeasy.net
	[69.17.117.53]) by mx1.freebsd.org (Postfix) with ESMTP id 3E3F28FC0C
	for <freebsd-questions@freebsd.org>;
	Wed, 23 Feb 2011 22:14:45 +0000 (UTC)
Received: (qmail 14251 invoked from network); 23 Feb 2011 22:14:44 -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 mail8.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP
	for <freebsd-questions@freebsd.org>; 23 Feb 2011 22:14:44 -0000
Received: by be-well.ilk.org (Postfix, from userid 1147)
	id 90C545082A; Wed, 23 Feb 2011 17:14:42 -0500 (EST)
From: Lowell Gilbert <freebsd-questions-local@be-well.ilk.org>
To: David Demelier <demelier.david@gmail.com>
References: <4D5CCB72.20505@gmail.com> <44ei75xyn6.fsf@be-well.ilk.org>
	<4D6580EC.8090007@gmail.com>
Date: Wed, 23 Feb 2011 17:14:41 -0500
In-Reply-To: <4D6580EC.8090007@gmail.com> (David Demelier's message of "Wed,
	23 Feb 2011 22:49:32 +0100")
Message-ID: <44mxlmtn3i.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: Wed, 23 Feb 2011 22:14:45 -0000

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

> I also noticed that even with the -F flag, mergemaster still asks for
> files that only differs by CVS id, see :
>
> -#####  $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.2.1
> 2010/06/14 02:09:0 6 kensmith Exp $  #####
>  +#####  $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.4.1
> 2010/12/21 17:09:2 5 kensmith Exp $  #####

Again, I think this is a local problem on your system.  
It certainly works on my system (RELENG_8, updated this week).