[There are lots more symptoms of this bug.  Basically any time you
check in a file with $Log, CVS 1.9.20 checks in the wrong things to
the RCS file.  For details see the "keywordlog" sanity.sh test which
was checked in 21 Dec 1997 (along with a fix to the bug).  -kingdon]

Date: Tue, 02 Dec 1997 16:51:07 +0000
To: bug-cvs@prep.ai.mit.edu
From: Andy Piper <andyp@parallax.co.uk>
Subject: Bug in 1.9.20 in patching log messages

Hi,

There is some sort of bug in 1.9.20 in client/server mode where merging log
messages come out as conflicts. So given a file:

//
// $Log: dev-log-conflict.txt,v $
// Revision 1.1.1.1  2001/04/14 00:10:26  dprice
// Initial import of cvshome.org web site.
//
// Revision 1.2  1997/12/22 00:22:43  kingdon
// CVS 1.9.20 bug with $Log is fixed.
//
// Revision 1.1  1997/12/04 01:49:20  kingdon
// Add open issues page.
//
//

which is modified on one machine and then updated on another you get a
message like:

cvs server: Updating .
P aaa.txt
cvs update: invalid change text in ./aaa.txt
cvs client: refetching unpatchable files
U aaa.txt

Or a conflict message where the conflict is the new log message. This does
not happen with a 1.9.18 server - only a 1.9.20 server. Server is on unix,
client on nt.

andy
   ___                ____         	Dr Andy Piper
  / _ \___ ________ _/ / Solutions_	(require 'disclaimer)
 / ___/ _ `/ __/ _ `/ / / _ `/\ \ /	andyp@parallax.co.uk
/_/   \_,_/_/  \_,_/_/_/\_,_//_\_\ 	boot /vmemacs