title: Preserving history when merging Subversion branches
body: <p>Is there any way to perform a merge with subversion 1.6 which would preserve the branch's history?</p>
  
  <pre><code>trunk:  r1 --&gt; r2 --------------&gt; r5
  branch:          \--&gt; r3 --&gt; r4 /
  </code></pre>
  
  <p>such as that when I merge at r4 the history will contain r3 <em>and</em> r4? At the moment subversion will record one <em>merge</em> commit with the diff between r4 and r2.</p>