Should I just take my turn with the files he put one folder too high and then move them where they belong ( and commit), or wait for him to ove everything in place?
Take your turn, and put everything in the right place again when you're done.
@Joseph - I suspect the fact that you had to use import at the start has screwed up your local copy somehow, so it's probably best for you just to start again to be ready for tomorrow.
Do exactly this:
1) Delete what you've got (not the actually game mod folder - that's fine, just the SVN working copy)
2) Create a folder called 'C2C MP trunk' - this will be the root of your new SVN working copy
3) Right click it and select SVN checkout
4) Enter this exact URL: 'svn+ssh://koshling@svn.code.sf.net/p/c2cmp/code/trunk c2cmp-code' with 'koshling' replaced by your sourceforge username
Since that will have to re-get everything it'll take a couple of hours, but at least we'll be sure it's clean.
When it's your turn this is the precise recipe of what to do:
i) SVN Update on the root folder (this should just get the latest savegame and turn list since nothing else should have changed)
ii) Start the mod and load the savegame (from 'Save+TurnList')
iii) Play the turn and press enter to end turn when done. The game will save to it's PBEM save folder
iv) Rename the generated save to remove the suffix and copy it over the one in 'Save+TurnList' (this should mean it gets the red ! icon)
v) Edit the turnlist in the same place (should also get red !)
vi) Do an SVN Commit on ''Save+TurnList' (red ! should vanish once done)
You should NEVER have to use anything other than Checkout (once when setting it up), Update (daily to get the latest state), and Commit (daily after updating the files with your turn results)