Page 3 of 3
Posted: Sun Jan 18, 2009 10:18 am
by beni
Wow, doesn't seem to be that easy. I would have hoped you'd be more successful with this. Either way it's great work. I would really like Orxonox to run on Mac was well
.
Posted: Sun Jan 18, 2009 11:40 am
by 1337
Yes of course, you can run ci. I've got tons of local changes though, but it should be quite easy to resolve the conflicts.
About the SignalHandler: The code was mistakenly conditioned with #if ORXONOX_PLATFORM != ORXONOX_PLATFORM_WIN32. I have changed that. Try again.
Posted: Sun Jan 18, 2009 3:54 pm
by superegg
Should I at first run "svn ci" or "svn up" ?
If I run up, I will prob override all my changes?
If I run ci, it wont make any change if I just run up after?
Posted: Sun Jan 18, 2009 4:41 pm
by x3n
svn up will merge your changes. svn ci isn't possible without updating the files first.
but if you're unsure, create a backup before.
Posted: Sun Jan 18, 2009 4:46 pm
by 1337
svn up shouldn't be a problem though. The only commit since your svn co was the SignalHandler fix. So you can easily do svn up.