cvs server: subsidiary diff failed

2001-02-13 Thread Peter Disiot
mp25\comms\edmi\) RCS file: /data/cvsroot/dev/emp25/src/com/sysreal/emp25/comms/edmi/MeterMsg.java,v retrieving revision 1.1 retrieving revision 1.2 Merging differences between 1.1 and 1.2 into MeterMsg.java cvs server: could not open output file: Permission denied cvs server: subsidiary diff failed

Error : cvs server: subsidiary diff failed

2000-07-28 Thread Badami, Srinivas
What is the meaning of this error or in what scenarios do you get this error.

Re: cvs server: subsidiary diff failed

2001-02-14 Thread Derek R. Price
es between 1.1 and 1.2 into MeterMsg.java > cvs server: could not open output file: Permission denied > cvs server: subsidiary diff failed Since the first two checkouts went fine, maybe you ran out of disk space? I'm not sure what else would prevent you from creating files on the s

Re: Error : cvs server: subsidiary diff failed

2000-07-28 Thread Larry Jones
Badami, Srinivas writes: > > What is the meaning of this error or in what scenarios do you get this > error. It means that when diff3 did diffs between the common file and each of the other two files, one of those (subsidiary) diffs failed for some reason. CVS uses diff3 to merge changes. What

Re: cvs server: subsidiary diff failed - Thanks please read though.

2001-02-14 Thread Peter Disiot
java,v > > retrieving revision 1.1 > > retrieving revision 1.2 > > Merging differences between 1.1 and 1.2 into MeterMsg.java > > cvs server: could not open output file: Permission denied > > cvs server: subsidiary diff failed > > Since the first two checkouts went fi