Protocol error: uncounted data discarded

[Jean-Christian Imbeault]

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


Thanks,

Jc
Note: This e-mail contains privileged and confidential information and is for 
the sole use of the intended recipient(s).  If you are not an intended 
recipient, you are hereby kindly requested to refrain from printing, copying, 
or distributing the information contained herein.  Furthermore, any other use 
of the information contained herein is strictly prohibited.  If you have 
received this transmission in error, please kindly notify the sender 
immediately and destroy all copies of the original message.