Re: branch merge causes error

[Larry Jones]

ken-oliver writes:
> 
> 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

"Write error" almost always means your disk is full.  If you're running
any version prior to CVS 1.11, the subsidiary diff temp files are always
written to /tmp instead of where you've told CVS to put temp files.

-Larry Jones

I always send Grandma a thank-you note right away.  ...Ever since she
sent me that empty box with the sarcastic note saying she was just
checking to see if the Postal Service was still working. -- Calvin