Cherry-pick a svn commit and add a 'Merged from rX' message at the bottom