Re: [Tiny-cobol-users] CVS merge

[David E. <de...@us...>]

Hi Rildo,

Rildo Pragana wrote:

 > ...
 >>> Unfortunately, I lost access to SF's CVS server.
 >>
 >> You still have admin status for the TC project on SF.
 >> What kind of problem are you experiencing ?
 >>
 > If I try to "cvs update" from my machine, it asks for the password
 > then stay locked for ever. The same with all other cvs commands.

Sounds like a SSH problem.

Some times generating a new random seed will fix a SSH problem.

But, I'm not familiar with your network setup.
If you use a firewall, I believe that SSH uses a special port and you 
have to adjust the firewall config.


Rildo Pragana wrote:
 > I forgot to give you the details on how I stay updated
 > (as "cvs update" don't work). First, I retrieve the full
 > cvs repository from SF, ...
 >
 > Then, I expand this and put under control of a local cvs server, so I
 > can checkout from it.  You see, this is not the best way to work...

Well CVS was never designed to merge two CVS repositories. There are 
special tools for that, such as Bitkeeper.

The only thing that I can suggest is extract a SF copy on a separate 
directory, change the 'CVS/Root' entries to your local TC repository 
name, and then do a merge (update) from your local TC repository.
Hopefully this method should do most of the work (not all) for you.