From owner-svn-src-head@FreeBSD.ORG  Sun Nov  9 13:58:15 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9A8B6106568B;
	Sun,  9 Nov 2008 13:58:15 +0000 (UTC)
	(envelope-from trhodes@FreeBSD.org)
Received: from pittgoth.com (pittgoth.com [205.134.163.206])
	by mx1.freebsd.org (Postfix) with ESMTP id 539108FC0A;
	Sun,  9 Nov 2008 13:58:15 +0000 (UTC)
	(envelope-from trhodes@FreeBSD.org)
Received: from localhost.fbsdsecure.org (c-68-83-213-214.hsd1.va.comcast.net
	[68.83.213.214]) (authenticated bits=0)
	by pittgoth.com (8.14.2/8.14.2) with ESMTP id mA9DK06m062929
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Sun, 9 Nov 2008 08:20:01 -0500 (EST)
	(envelope-from trhodes@FreeBSD.org)
Date: Sun, 9 Nov 2008 08:19:58 -0500
From: Tom Rhodes <trhodes@FreeBSD.org>
To: Alexey Dokuchaev <danfe@FreeBSD.org>
Message-Id: <20081109081958.140b26f7.trhodes@FreeBSD.org>
In-Reply-To: <20081109102551.GA61113@FreeBSD.org>
References: <200811090758.mA97wNKt033972@svn.freebsd.org>
	<20081109111133.88165rocbmwehckc@webmail.leidinger.net>
	<20081109102551.GA61113@FreeBSD.org>
X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i386-portbld-freebsd8.0)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@FreeBSD.org, Alexander@Leidinger.net, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org, sobomax@FreeBSD.org
Subject: Re: svn commit: r184781 - head/usr.sbin/mergemaster
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Nov 2008 13:58:15 -0000

On Sun, 9 Nov 2008 10:25:51 +0000
Alexey Dokuchaev <danfe@FreeBSD.org> wrote:

> On Sun, Nov 09, 2008 at 11:11:33AM +0100, Alexander Leidinger wrote:
> > Quoting Maxim Sobolev <sobomax@FreeBSD.org> (from Sun, 9 Nov 2008  
> > 07:58:23 +0000 (UTC)):
> > 
> > >Author: sobomax
> > >Date: Sun Nov  9 07:58:23 2008
> > >New Revision: 184781
> > >URL: http://svn.freebsd.org/changeset/base/184781
> > >
> > >Log:
> > >  Ignore files that only differ in CVS Id tag.
> > 
> > I would like to have (ideally automatic) replacement of files in this  
> > case.
> 
> Seconded.  Methinks it would be nice to have CVS Id's updated, either
> automagically or via interactive process, but certainly not silently
> ignored.
> 
> ./danfe
> 

Doesn't "mergemaster -Ui" just do that?  And yes, I agree,
ignoring files this way is probably a bad idea.

-- 
Tom Rhodes