Can someone explain this to me? :-)

#1 If you're using WinCVS, you can just right click a folder or item, and hit Update Selection. WinCVS will automatically try to merge the version on the server with the version on your HDD.

Any conflicts will be shown in the output window, so you can pinpoint problems.

#2 Ok, so the way I understand it, I make a directory on my hard drive called /torque (or something). Then I download the 1_1_0 release into this. I've already done this much, and I then copied the /torque folder to a work folder where I'm doing my own modifications.

Now, later when I want to update the code, I do an update with WinCVS, but can I then select "Head" or whatever the latest stable version is and have it update the 1_1_0 release I already have?

Or do I need to make a separate folder for it and download the whole Head release?

Then, once I get the latest code, I can do a Windiff on my code to see what's added, assuming I'm not making my modifications directly in the 1_1_0 folder?

Does that sum it up? Or is there an easier way?

#3 Download the Torque Head version to your C:\ drive. Make all your changes there. Place your new code in the engine directory, make your script changes in the example directory. Don't change any of the paths that have been created or move the existing files around...

Now, before you update using CVS make a copy of the folder someplace as a backup. WinCVS, as Bryan has explained, will inform you of conflicts in your files with the new ones from CVS. You can try and resolve them yourself, through the merge process or, if things go sour restore from your backup copy and try again.

I have tried a number of different ways and I find that by simply leaving everything where it is on the C: drive and working with it there I have the fewest problems. I just make a copy before I download from CVS as insurance.

#4 Thanks! I'll give that a shot.