[Top][All Lists]

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

branch merge causes error

From: ken-oliver
Subject: branch merge causes error
Date: Fri, 1 Dec 2000 22:01:23 -0500

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
Merging differences between 1.6 and 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?

reply via email to

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