info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Protocol error: uncounted data discarded


From: Mark D. Baushke
Subject: Re: Protocol error: uncounted data discarded
Date: Thu, 21 Oct 2004 21:02:32 -0700

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jean-Christian Imbeault <address@hidden> writes:

> > to get the version numbers of the client and server you are using. If
> > either of them is less than cvs 1.11.17 for the stable release
> 
> $ cvs version
> Client: Concurrent Versions System (CVS) 1.11.15 (client/server)
> Server: Concurrent Versions System (CVS) 1.11.17 (client/server)

Yup, cvs 1.11.x has this problem both of those releases:

>>> I am trying to merge one branch into HEAD but I get the following
>>> strange error.
>>> 
>>> $ cvs -nq update -j DEV
>>> M dao/EQRes_rwsConn.java
>>> RCS file:
>>> /repos/MRW/mizuhoApp/src/com/mizuho/rws/common/business/dao/EQRes_rwsConn.java,v
>>> retrieving revision 1.1
>>> retrieving revision 1.1.2.1
>>> Merging differences between 1.1 and 1.1.2.1 into EQRes_rwsConn.java
>>> Protocol error: uncounted data discarded

It is fixed in cvs 1.11.17.1 (will be in cvs 1.11.18) with this patch:

| 2004-09-08  Mark D. Baushke  <address@hidden>
| 
|       * sanity.sh (join7): Fix if-then-else conditional.
| 
|       * server.c (server_updated): Deal with cvs -n update -jt1 -jt2
|       "protocol error: uncounted data discarded" problem.
|       * sanity.sh (join7): New test for this case.

 File [changed]: server.c
 Url: https://ccvs.cvshome.org/source/browse/ccvs/src/server.c?r1=1.373&r2=1.374
 Delta lines:  +1 -0
 -------------------
 --- server.c   5 Sep 2004 03:22:52 -0000       1.373
 +++ server.c   8 Sep 2004 02:13:36 -0000       1.374
 @@ -4820,6 +4820,7 @@
            free (scratched_file);
            scratched_file = NULL;
        }
 +      buf_send_counted (protocol);
        return;
      }

The patch needs to be applied to the server, but you may wish to
consider upgrading your client in any case.

A suggestion: Post questions to this forum from your home e-mail account
and then submit a bill for services rendered to compensate you for needing
to work at home to support the tools of Mizuho Securities... or don't if
you think it would lead to a hostile work environment.

        Good luck,
        -- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFBeIZY3x41pRYZE/gRAgWvAJ91Cqjmq1c/1uWG+TLiiC1SDU7Z2ACffxe4
QsgHA+rCw7g5tuC/1AY+QXY=
=46QN
-----END PGP SIGNATURE-----




reply via email to

[Prev in Thread] Current Thread [Next in Thread]