title: How to repair a commit in the wrong branch?
body: <p>I accidentally committed a change in <code>branches/2.1/foo.cpp</code> instead of <code>branches/2.0/foo.cpp</code>.</p>
  
  <p>The most straightforward way to fix this seems to be to merge the change back to 2.0:</p>
  
  <pre><code>~/branches/2.0 $ svn merge svn://repository/branches/2.1/foo.cpp foo.cpp
  </code></pre>
  
  <p>But, according to <a href="http://svnbook.red-bean.com/en/1.8/svn.branchmerge.advanced.html" rel="nofollow">this document</a> this should be avoided:</p>
  
  <blockquote>
    <p>Avoid subtree merges and subtree mergeinfo. Perform merges only on the root of your branches, not on subdirectories or files </p>
  </blockquote>
  
  <p>What would be the best way to go about then?</p>