Game Development Community

CVS Questions

by Rodney (OldRod) Burns · in Torque Game Engine · 04/20/2002 (10:34 am) · 2 replies

I'm still not comfortable with CVS and understanding how it works exactly. Can someone tell me if this is possible?

I have a \torque folder on my local hard drive that I keep updated with the latest HEAD release. I also have my own game code in a separate folder (called \sor) with which I am developing.

What I've been doing is updating the HEAD version once in a while and trying it out to see what's new. Then looking in the code for new features that I want to put over in my code.

Here's my question: Can I use WinCVS to update between the GG server and my \torque directory, and also use it to update between my \torque and \sor directory (both on my local hard drive?

Also, has anyone used the Tortoise CVS (http://www.tortoisecvs.org/) that was posted in the resources a while back? Wondered if it was easier/harder to use?

Thanks :)
NextNext Thread
PrevPrevious Thread
More from Torque Game Engine


Torque Owner Badguy
#1
04/20/2002 (6:25 pm)
An alternative here would be to install a cvs server of your own.
submit your project to it.
if you kept the directory structure the same,
you could simply login to your server and diff the new head to your project in cvs.

Ive not used the tortoise

Torque Owner Ben Giddings
#2
04/21/2002 (10:14 am)
The CVS import command was designed to do exactly this. You treat the torque engine code as the "vendor branch" and import it into your project, then you add files that you want and mess around with things, when you want to get new code from GG, just reimport it with a new release tag. Normally you'd wait for a stable branch of the code you're importing instead of constantly importing the HEAD, but if you want to keep integrating the bleeding-edge stuff you can just use a vendor branch name of HEAD_APR_21 or something.

The syntax of the import command is:
cvs import -I ! -I CVS -m "Import of torque 1.1.0" myproj torque Release_1_1_0

Note that you have to have the "-I CVS" so that it doesn't try to import the CVS directories. Also, be careful when you import things that you correctly mark binary files, I think by default when you import files it treats everything as a text file.