Version Control

[ElectricNoodle]

Hey, wasn't sure where this fits so thought I'd post here

Me and a friend are planning to start work on a game in the next few weeks, we both do programming, and attend the same course, but I was wondering if there was some sort of tool out there.. .that would allow us to both have a copy of the project, but when changes were made on either end, it automatically changed it on both ends?? Kind've like TortoiseSVN, but without the server in the middle?  That way we could both easily contribute, without having to pass files about at uni, or keep uploading stuff to file sharing sites!!

Thanks in advance for any ideas!!!

ElectricNoodle

[Kulverstukas]

I don't think there is a way without a server between. What you want is a direct connection to each other.

[Stackprotector]

then j ust host a apache-svn server on on of your sides, and eveytime you guys get online you synchronise

[ElectricNoodle]

Cheers for the input

With regards to the apache svn server, what would happen, if say I edited file A, adding a certain function to the code, but then my friend also editeded file A, adding different stuff to what I added? Would it merge both into it? Or would it be a case of having to do it seperately?

[xor]

Generally with proper source control management, a person has to "check-out" a file to be able to work on it. They then make changes, and check it back in.

If person A tried to check out a file when person B already has it out, they will either only get to see it read only, won't be able to see it at all, or just won't be able to check the file back in.

Even if it allows you to both edit the file at the same time, it will store two copies when you both upload it. This is one of the main points behind version control, each edition you upload / check in, is a new version of the file. Then if you erase each others code, or if the bastardized source control lets you both check out a file, you will have to manually merge the code that was worked on.