Automerging now in rake_commit_tasks
The rake_commit_tasks plugin now supports automatically merging changes from branch to trunk. I describe the feature and the use case at Automatically merge changes from branch to trunk, although the merging code now uses “svn merge” instead of “svn diff” in order to keep svn mergeinfo.
Basically, if you branch to release code and then fix a bug on the branch, the change will automatically be merged over to the trunk when you run a “rake commit.” Just set PATH_TO_TRUNK_WORKING_COPY to the location of the trunk checkout in your Rakefile.
If you are curious, you can check out the commit at github.
2 comments
Comments
-
Nice stuff, Paul. Rao and I put RC in the project here in Chi. Unfortunately, we've run into a herd of problems. RC falls down pretty hard if your svn repo is slow or unstable, i.e., managed by some faceless corporate entitiy. I've got some code in my fork to deal with it, but it could use a little more polish. I've also got some rudimentary Git support, but I'm finding that RC isn't necessary in Git, so I may drop it out. Hope you guys are having fun down there, Toby
-
Nice plugin, but can't do the same thing in capistrano?