-=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- (c) WidthPadding Industries 1987 0|475|0 -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=- -=+=-
SoCoder -> Blogs Home -> Blogs

 
Afr0
Created : 14 March 2008
 

Aaah SVN!

Merging, anyone?
Aaargh!

Tonight when I got home, I downloaded the HEAD revision of the Pokemon Online project from the SVN server, expecting everything to be ok.
But, as it turns out, SVN is not good at handling files with the same filenames, even when they're located in different folders!
Basically, all the files I had updated last night had disappeared from my Client project folder, because files with the same name happened to be in the project folder for my preliminary TileEngine (which I added to the SVN server later that same night).
Fortunately, I've gotten it mostly taken care of now, but I ended up spending a night on cleaning up and merging separate revisions unnecessarily, and I'm still wondering how to get the latest revision uploaded properly, even without the TileEngine project folder, due to the fact that files with the same name still exists in Client\Content and Latest Builds\Client\Content.

- Programming is bad for you!!

 

Comments
Friday, 14 March 2008, 18:27
JL235
 		I used to use SVN and I thought it was pretty good. I've had a few similar problems too where there were two files with the same name, in the same folder, but in different cases. On Unix this is accepted, on Windows it isn't. That's where I lay the blame.