Game Development Community

CVS questions

by Emil Diego · in General Discussion · 11/09/2006 (5:35 am) · 7 replies

I have never used CVS before as my revision control system, so I have a quick question.

I have made a few modifications to the TSE code myself to tweak a few things. For a product like TSE that is still undergoing a lot of code changes, how do i get the new code changes from the cvs server without overwriting the local changes that I have made to my locacl copy of the code?
NextNext Thread
PrevPrevious Thread
More from General Discussion


Torque Owner Aaron E
Default Studio Name
#1
11/09/2006 (5:59 am)
Before answering your question, I should mention that Garage Games no longer uses CVS for customer source downloads. From your accounts page, you can download the source as a zip file for some products (like TSE) or as an SDK installer exe (like TGE 1.4.2). I'm not sure why some are ZIPs and some are EXEs, but maybe the 'finished' products are released as installer EXEs and the 'still in progress' products are provided in ZIP format. Just a guess, though.

As for me, I download and extract the files to a separate location and then merge everything by hand. That's the slow and painful way. However, you might want to run a diff between the two versions instead using a code merging program (WinMerge maybe). Sorry to be so vague on that, but I've never done it myself. I'm too hard-headed to try the easy way.

Torque Owner Emil Diego
#2
11/09/2006 (6:06 am)
I wasn't aware that they switched to a zip file format :(. That's gonna make it diffaculty to merge my code. Guess I'll have to do what you said and use a diff program and mege the files manually. Thanks for the response.

Torque Owner Aaron E
Default Studio Name
#3
11/09/2006 (6:09 am)
I should probably have explained it differently. I merge my code manually instead of using a merge program. Most everyone else uses a merge program to automate most of the process.

Torque Owner Sultan Ansari
Default Studio Name
#4
11/09/2006 (6:42 am)
I'm using Beyond Compare right now: http://www.scootersoftware.com/

Its very easy to use and theres a 30 day free trial.

Torque Owner Emil Diego
#5
11/09/2006 (6:43 am)
I'll give it a try. Although i'm not too fond of aitomatic merging. I've run into trouble doing that in the past. Thanks for the advice :)

Torque Owner Stefan Lundmark
#6
11/09/2006 (6:46 am)
AFAIK that's hardly automatic. It gives you a summary of the differences and let's you implement them directly in the tool.

Torque Owner Badguy
#7
11/09/2006 (9:00 am)
Winmerge is the answer here.

nice program. and free too.

but best to have consistent persistent repository.
so simply install cvs locally, run a local repository where you have one head branch from gg.
and you merge between that and your modified branch.
pretty painless.