Re: Again CVS conflicts on www-master

[Matt Kraai <kraai@ftbfs.org>]

On Thu, Apr 10, 2008 at 10:31:22PM +0200, Jens Seidel wrote:
> http://www-master.debian.org/build-logs/webwml/cvs_update.log
> contains again some CVS conflicts such as
> 
> cvs update: Updating german/consultants
> cvs update: conflict: `german/consultants/lancentrum.wml' is modified
> but no longer in the repository
> C german/consultants/lancentrum.wml
> 
> What was the reason during the last time? Could it be a change in the
> cvs version since the upgrade to Etch?
> 
> I think I observed in the past a slight change in the evaluation of
> CVS's $Id:$ where the date format changed from "2008/02/11" to "2008-02-11"
> or similar (don't remember exactly). A find/perl call fixed it.

That was the problem with all of the locally files except for
english/devel/misc/card.{dvi,ps}.  I've replaced them with fresh
versions, so only the card.{dvi,ps} files should cause problems in the
future.

Thanks for reporting this,

-- 
Matt