Game Development Community

CVS Question

by Chris "DiGi" Timberlake · in Torque Game Engine · 10/01/2003 (1:29 pm) · 5 replies

I'm not real good with CVS stuff, but let me get this straight if i have a edited source, and i download the cvs into the directory i have the source in, will it edit the files or overwrite?

#1
10/01/2003 (1:41 pm)
It will merge your local changes with the current version in cvs.
#2
10/01/2003 (2:12 pm)
You want to be really careful if you've deviated from the Torque CVS in any major way however. I highly recommend keeping Torque's codebase, and your codebase in seperate directories and using a tool to merge by hand.

It's tedious, yes I know. But sometimes it is well worth it to help prevent something dangerious from happening to your version.
#3
10/01/2003 (2:20 pm)
I concur with Robert on managing your game source.
#4
10/01/2003 (2:28 pm)
What if i were to make a backup, then cvs update and if it messes up, just delete and restore it
#5
10/01/2003 (4:44 pm)
Then you would be back to where you were when you did your back up. This is one way of dealing with the problem.