branch merge causes error

[ken-oliver]

When attempting to merge in changes from a branch with the:

 

cvs update -j labelname

 

command.  I received the following:

 

retrieving revision 1.6
retrieving revision 1.6.2.2
Merging differences between 1.6 and 1.6.2.2 into filename

cvs server: write error
cvs server: subsidiary diff failed

 

 

labelname is a label made on the branch.

filename is a file where there will be a merge between the mainline and the branch.

 

What is this?  How do I get rid of it?

Ken