Date: Sun, 9 Nov 2008 08:19:58 -0500 From: Tom Rhodes <trhodes@FreeBSD.org> To: Alexey Dokuchaev <danfe@FreeBSD.org> 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 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20081109081958.140b26f7.trhodes>