[Inquisitor]

WinCVS Setup

Ok, go to Admin-->Preferences

In the CVS root, enter the following:

[email protected]:/home/fs2source/cvsroot

Where you replace Inquisitor your username. Anon users type :

[email protected]:/home/fs2source/cvsroot

Authentication is: Password file on CVS server. Then click on the WinCVS tab, and in the home folder, pick a folder on your hard drive.

Click ok to close the dialog.

Make sure the path you selected is reflected in the path dialog in the tool bar, the select the Admin menu again.

Admin-->Login

Type your password, in the case of anonymous users, this password is anonymous.

In the Feedback/Console window at the bottom, it should say something like:

"CVS exited with code 0"

That means you are logged in.

Now, you need to get set up for the first time, vack to the menus:

Create-->Checkout Module

In the "module to check out" field, type "fs2_open"

Verify that the path is correct in the path field. Click the "Checkout options" tab.

This is where you would specify a branch, in our case we have only the one leave this blank if you don;t want the directx build (it will be merged soon anyway), if you are working with the branch, you can type "directx8" here.

The globals tab you can tweak, but the defaults are fine. Click ok and start downloading the code!

It's that easy. when you want to grab a fresh copy, you simply right click on the folder you want to update in the CVS window, and select update, it will merge any code changes with yours, and life will be good

I'll cover committs later.

any questions?

[RandomTiger]

Sorry if this is a little off topic, but I think we need a coder tutorial site where things like this can be put and added to.

[Inquisitor]

Not off topic at all

HLP/VW: Another gentle reminder about hsting access

[Bobboau]

ah, It works

[Inquisitor]

Sorry it took so long to write it up.

Bobboau, make sure you ask lots of questions if you have them

[Bobboau]

why are all the files read only?

[Inquisitor]

There is a check box inpreferences youcan select to undo that

[Bobboau]

ok I'm going to try and get my beam changes ported over tonight, when I've got my changes I'll ask for more information on how to do what

[Inquisitor]

Excellent

[Bobboau]

ok how do I upload my changes?
is it as simple as clicking on the folder and selecting commit?

[RandomTiger]

No, you have update your code to get any changes that other people have made. You will then perhaps get conflicts between your new key stuff and mine. You wll have to resolve these, ask for help if you are anything less than 100% sure. Then give it a test and if its OK then commit.

[Inquisitor]

Always update first, then commit. So if you have been working, and want to committ, gran a CVS update, pay attention to the merges (they are marked with a M in the console window of WinCVS), and resolve any conflicts (the are marked with a C), then right click, commit.

That way, you catch any thing that RT is talking about, and RT should be doing the same thing.

We all get an email when changes are committed, so we can go look at the changelog, see who did what.

Might help to find an email account that you can use for this, so you can subscribe that account to the notification dealie

[Bobboau]

what are things marked with a P?

[Inquisitor]

I *THINK* those are files that you haven't changed locally, that are changed on the server, I'll have to look

[Bobboau]

ok, so I update and then commit,
I've updated twice and tested and everything seems to still work
well if I screw everything up you can undo it right?

[RandomTiger]

Update then recompile the code. Then check for conflicts, for one thing the update will give you my key code which will conflict with yours (unless you've updated already). Give it a quick test to make sure its OK and only then commit.

[Bobboau]

I alredy took that into consideration (read no conflict with you're code)
so I'm gona cmommit and see if anything wrong hapens

[RandomTiger]

k

[Bobboau]

ok there, I did it (I think), update and make sure I didn't break anything

[RandomTiger]

Sounds like it worked, Im checking out a copy to see how it went.
What did you actually change?

Edit: Nevermind, I just read your checkin.
Looks like Im getting what I want.