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
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