I think I finally have a solution for using Rails migrations with
Subversion branches. I’ve created a plugin, Subverted Migrations,
that does the grunt work in merging migrations (similar to what
svnmerge.py does for merging files). The plugin has two main functions:
- Keeps your version numbers straight between branches, so you don’t
have conflicting version numbers when merging. - Keeps track of which migrations have been applied to the database,
and applies merged-in migrations after merging even if newer
migrations have already been applied.
Here’s my blog post on the plugin, with a Chunky Bacon example to
hopefully make things more clear:
http://www.bradediger.com/blog/2006/11/subverted_migrations.html
The svn repo is:
svn://svn.madriska.com/plugins/subverted_migrations
I welcome any feedback, patches, bug reports, general whining and
complaining, etc., as usual.
Brad E.