The Fine Art of Wincvs ?
by Ian Roach · in Torque Game Engine · 12/20/2001 (2:14 am) · 2 replies
Hello all ive had this problem for quiet some time now .
Its all related to updating and merging any new code updates to the existing code.
Whats a quick simple way to do this.
Recently i installed Torque Version 1 using the downloaded executable i got when i brought the engine.
Ive since setup wincvs correctly and selected the torque source folder and did update. Everything updated correctly but im not sure if it merged or whatnot ?
With updates of every code im now getting errors compiling in relation to the files aiconnect.cc and aistate.cc i think. it relates to functions in the code called Damage Radius and states the function is not a part of this class (indeed in the header there is no declaration of this)
So what is the problem here ? Did i get unfinished code ?? Also what are the options such as Avoiding stickyness e.t.c
I noticed in teh cvs explorer window (left hand side the ai folder located under the torque / engine directory is not marked as a wincvs folder. it seems to be the only one. Why is this.
Any help anyone could give me with giving me a 5 step tutorial to merging and updating would be greatly appreciated.
Regards
Its all related to updating and merging any new code updates to the existing code.
Whats a quick simple way to do this.
Recently i installed Torque Version 1 using the downloaded executable i got when i brought the engine.
Ive since setup wincvs correctly and selected the torque source folder and did update. Everything updated correctly but im not sure if it merged or whatnot ?
With updates of every code im now getting errors compiling in relation to the files aiconnect.cc and aistate.cc i think. it relates to functions in the code called Damage Radius and states the function is not a part of this class (indeed in the header there is no declaration of this)
So what is the problem here ? Did i get unfinished code ?? Also what are the options such as Avoiding stickyness e.t.c
I noticed in teh cvs explorer window (left hand side the ai folder located under the torque / engine directory is not marked as a wincvs folder. it seems to be the only one. Why is this.
Any help anyone could give me with giving me a 5 step tutorial to merging and updating would be greatly appreciated.
Regards
About the author
#2
Step 2. Download the latest from the HEAD directory following the directions normally used to get the full version- i.e. the original directions you got with the V12 engine for getting the HEAD release.
Step 3. Make all your changes to this new version. Move any stuff you wrote from the renamed torque directory in step 1 to the appropriate place in the new version. Don't change any of the subdirectory names or files names. If you add files or subdirectories WinCVS will give you an error saying they are not in CVS whenever you update - this is ok.
Step 4. After all your changes are ported, compiled and tested, delete the old directories from Step 1 to free up the space.
Step 5. In the future, before you do any CVS updates copy your entire torque directory structure to an alternate location as a safety measure. Then use "Update Selection" under the Modify menu to get all future updates as described in the Using CVS post. This will automatically merge for you so you don't have to. Anything that can't be automerged (happens occasionally)will be replaced with the new version. Your old version will be stored on your hard drive so you can hand merge them later. They will be flagged for you so you can call them up easily.
Steps 1 thru 4 are a one time correction. You should never have to do anything but step 5 after you have merged correctly one time.
12/20/2001 (1:07 pm)
Step 1. Rename your torque directory to something else for now. This is to preserve any changes you made.Step 2. Download the latest from the HEAD directory following the directions normally used to get the full version- i.e. the original directions you got with the V12 engine for getting the HEAD release.
Step 3. Make all your changes to this new version. Move any stuff you wrote from the renamed torque directory in step 1 to the appropriate place in the new version. Don't change any of the subdirectory names or files names. If you add files or subdirectories WinCVS will give you an error saying they are not in CVS whenever you update - this is ok.
Step 4. After all your changes are ported, compiled and tested, delete the old directories from Step 1 to free up the space.
Step 5. In the future, before you do any CVS updates copy your entire torque directory structure to an alternate location as a safety measure. Then use "Update Selection" under the Modify menu to get all future updates as described in the Using CVS post. This will automatically merge for you so you don't have to. Anything that can't be automerged (happens occasionally)will be replaced with the new version. Your old version will be stored on your hard drive so you can hand merge them later. They will be flagged for you so you can call them up easily.
Steps 1 thru 4 are a one time correction. You should never have to do anything but step 5 after you have merged correctly one time.
Torque Owner Ace
I usely just download the head to a new torque directory (myself)when i hear somenew is in that i want and start over