bug-cvs
[Top][All Lists]
Advanced

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

cvs 1.11 can not merge differences


From: Ingmar Bitter
Subject: cvs 1.11 can not merge differences
Date: Sun, 6 May 2001 21:39:42 -0400

Hi,

cvs 1.11 can not merge differences
 
upon attempting to merge changes from other developers 
into my code I get: 

> //D/vc1k/src/ReaderLib
$ cvs update Fields.C
RCS file: /raid/CVS/v1kApp/src/ReaderLib/Fields.C,v
retrieving revision 1.60
retrieving revision 1.64
Merging differences between 1.60 and 1.64 into Fields.C
cvs server: could not open output file: Permission denied
cvs server: subsidiary diff failed

> //D/vc1k/src/ReaderLib
$ cvs --version

Concurrent Versions System (CVS) 1.11 (client/server)

Copyright (c) 1989-2000 Brian Berliner, david d `zoo' zuhn,
                        Jeff Polk, and other authors

CVS may be copied only under the terms of the GNU General Public License,
a copy of which can be found with the CVS distribution kit.

Specify the --help option for further information about CVS


We run cvs server on a sun ultrasparc and connect to 
it from windows 2000 clients. 
I assume the "output file" above is the temporary 
diff or the temporary merged result. So I also assume 
that this file was attempted to be created on the client 
side, not the server ? All permissions are given on 
the client. On the server permissions are set by cvs 
automatically. 

We had been using our setup successfuly for a year. 
I am not aware of any change that may have caused this. 

Any idea what I am doing wrong ?

-Ingmar 




reply via email to

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