Re: Again CVS conflicts on www-master
On Thu, Apr 10, 2008 at 03:01:22PM -0700, Matt Kraai wrote:
> 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
> >
> > 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
What was the status of card.{dvi,ps}? Was there a conflict too?
I noticed that cvs log contains
"keyword substitution: kv"
which should probably be changed into binary mode using
cvs admin -kb card.{dvi,ps}
cvs update -A card.{dvi,ps}
The explicit option -A is required to force a rewrite without keyword
substitution in the local filesystem (does not happen by default as the
content did not changed).
> versions, so only the card.{dvi,ps} files should cause problems in the
> future.
Did you replaced all files in the working copy or only conflicting ones?
As this problem happened already short time ago I'm sure there will
be more conflicts once other files get changed if the initial checkout
happened with an older CVS client.
PS: I noticed this problem because the translation statistics were wrong
again and I remember Helge reporting it the last time.
Jens
Reply to: