Game Development Community

CVS and merges

by Jeff Randall · in Torque Game Engine · 01/11/2002 (7:14 am) · 2 replies

I'm trying to figure out a way to successfully merge just script files (.cs & .gui) with the CVS release.

I created a separate dir, called RPG, where I have just the compiled EXE and all of the script folders. I've changed around some of the directory structures, renamed 'fps' dir to 'main', made heavy changes in the 'data' dir and moved some files around. One big change was to move all image files out of the script folders and place them in a data/textures dir.
When I do a CVS update, I compile the EXE using the new code, then copy the EXE to the RPG dir so it accesses our script. So, here are the questions:

1) How do I tell CVS to merge just the script files to a different directory?
2) How do I know what script files are changed or updated on the CVS copy?
3) Am I going about this all wrong? Is there an easier way?

I just wanted my project to be separate than the Torque dir so no matter what, I still have the original torque copy. I also ripped all demo specific stuff out of the RPG copy, which makes it smaller and easier to deal with. Man, that data dir was just crammed full of junk :)

Any thoughts are appreciated.
NextNext Thread
PrevPrevious Thread
More from Torque Game Engine


Torque Owner John Quigley
#1
02/06/2002 (7:07 pm)
Once you rename directories or files, cvs won't "know" about them anymore because they do not match the repository. So generally you want to leave the names the same if you want to automatically update the files with cvs.

As for updating .cs scripts, generally you can just do a "cvs update" from a directory, as long as that directory originally came from a cvs checkout or is a copy of one that did. So for example, you can do

cd /example/fps/client/scripts
cvs update

to update just that scripts directory, and cvs will automagically attempt to merge the local files with the repository.

Torque Owner Richard O
#2
02/09/2002 (7:37 am)
Jeff,

You might want to take a look at Araxis Merge. It is one of the best file comparison/merging and folder synchronization applications that I have used. As John stated, once you start making/renaming directories, CVS (the GG?s repository) does not know about them.

Like you, I was manually moving the files that changed to my new directories (using the output from WinCVS). If I had changed a script or module and GG?s also made a change to the same script/module, I was using GNU?s diff to see the changes, then manually making the changes to my version. Besides this process being totally manually, it was very time consuming. I ran across Araxis Merge on www.download.com while searching for a good 3rd party tool to solve this problem. I would recommend that you download it and see if it will also help you.

Rich