This post originated from an RSS feed registered with Ruby Buzz by Paul Gross. Original Post: Automerging now in rake_commit_tasks Feed Title: Paul Gross's Blog - Home Feed URL: http://feeds.feedburner.com/pgrs Feed Description: Posts mainly about ruby on rails. Latest Ruby Buzz Posts Latest Ruby Buzz Posts by Paul Gross Latest Posts From Paul Gross's Blog - Home

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.