CVS Merge Help....File added on both Trunk and Branch

2002-03-15 Thread Patrick Burleson
Hello all, I have the problem where a file was added both on a Trunk and a branch and CVS is giving me the "foo.c exists, but has been added in revision BAR" error message when I try to do a merge. I have read many posts about this subject, but the answer was always what causes this message, not

Setting up CVS for use with Pserver

2002-05-05 Thread Patrick Burleson
Hello all, I have read the docs about setting up pserver and the permissions needed and all of that, but I don't see things working like they are documented. I have xinetd 2.3.0 and cvs is configured as such: service cvspserver { port= 2401 socket_type