merged -- please tell me if anybody has any issues! @max: decks are no longer deleted on update, thanks for the heads up!
edit: there are currently a number of tree conflicts. I'm figuring out the best way to deal with them.
edit2: Bah, this will be annoying. When I originally deleted the directories that will become unused after the migration, I expected subversion to leave the non-versioned files (like .dck files) alone. It turns out that subversion just deletes all files in those directories. To avoid this, I added the directories back into svn. However, since I deleted the directory, then re-added it, svn will complain about tree conflicts when everyone svn up's to the current revision : / Normal users who install releases or snapshots won't have any issues, but devs who check out from svn will have to follow this procedure to get back on track:
- update from svn
- run forge at least once to complete the data migration
- revert "local" changes in the source tree to clear up the tree conflicts. save any work you have in progress but have not yet checked in before doing this
- do it from eclipse or from the commandline
- svn revert --depth=infinity .
sometime in the near future, I'll remove the leftover directories (such as res/decks) for good and clean up, but if I do it now, svn will delete the user data in those directories before it can be migrated : (
I think we can close
issue 634 on Mantis.