Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Feb 2011 17:14:41 -0500
From:      Lowell Gilbert <freebsd-questions-local@be-well.ilk.org>
To:        David Demelier <demelier.david@gmail.com>
Cc:        freebsd-questions@freebsd.org
Subject:   Re: mergemaster -U ask for a lot non-user modified files
Message-ID:  <44mxlmtn3i.fsf@be-well.ilk.org>
In-Reply-To: <4D6580EC.8090007@gmail.com> (David Demelier's message of "Wed, 23 Feb 2011 22:49:32 %2B0100")
References:  <4D5CCB72.20505@gmail.com> <44ei75xyn6.fsf@be-well.ilk.org> <4D6580EC.8090007@gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
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).



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?44mxlmtn3i.fsf>