-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Jean-Christian Imbeault <[EMAIL PROTECTED]> writes:
> 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
>
Such errors have been fixed in the past and may be available in a newer
version of cvs than you have at present. Use the command:
cvs version
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 (or cvs
1.12.9 if you are using the development feature branch), then upgrade
and report the problem again if it persists.
In the general case, you should also tell us the operating system you
are using and the transport method (:ext: over ssh, :pserver:,
:gserver:, or whatever you happen to be using).
> 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.
The above disclaimer is silly and makes your company (and you) look
foolish when you send such messages to an open mailing list that will
keep copies of your message in many different separate archive
locations.
If you can't stop sending such attachments due to corporate policy, I
suggest you get an e-mail account that is not as restricted and use that
to post questions in the future as many folks will just ignore such
e-mail.
(I'll probably ignore any future message from you that still retains the
disclaimer myself...)
Good luck,
-- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)
iD8DBQFBd3uV3x41pRYZE/gRAm5QAJwPT2jfqQlQV7MyvjXIhzilTqY98QCdHdUs
OEI7282YkRy6W2mzXNyXL2I=
=p40L
-----END PGP SIGNATURE-----
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs
