problems with CVS keyword substitution

[Kris Thielemans]

Hi,

we're having problems with the keyword substitution in CVS. When we do 'cvs
update', files get updated alright, but they're full of 'fake' conflicts of
the type below


<<<<<<< FullArrayIterator.inl
// $Id: FullArrayIterator.inl,v 1.1 2000/06/14 18:36:44 kris Exp $
=======
// $Id: FullArrayIterator.inl,v 1.2 2001/09/14 16:57:20 kris Exp $
>>>>>>> 1.2


That is, the only change in the file is the text of the keyword, and cvs
didn't recognise this.

I sort of expect this is because we're running cvs 1.11 on our NT clients
(the server is a Linux machine running 1.11.1p1). Is this the cause of our
problems?

Unfortunately, there isn't a compiled Windows 1.11.1p1 available. Neither
can I download the sources from the website at the moment (there are only
sources for automake available). So, I'll try to check that out with cvs and
see if I can compile it on NT using gcc (and cygwin). Should this work?  The
first step gave me the following problem:

$  ./noautomake.sh --noautoconf
getopts: not found

Thanks!

Kris Thielemans
Imaging Research Solutions Ltd
Cyclotron Building
Hammersmith Hospital
Du Cane Road
London W12 ONN, United Kingdom

web site address:
http://www.irsl.org/~kris