title: Merge trunk to branch in Subversion
body: <p>I'm using Subversion 1.4.6, and I cannot upgrade to version 1.5 right now.</p>
  
  <p>The situation:</p>
  
  <ol>
  <li><p>The trunk has a lot of structural changes (i.e. moving files around, mostly).</p></li>
  <li><p>I have a branch that was recently merged from the trunk, but before the major changes.</p></li>
  </ol>
  
  <p>What is the best way to merge the trunk to the branch?</p>
  
  <p>What I had in mind:</p>
  
  <ol>
  <li><p>First carefully merge the branch to the trunk, by merging only the modified files in the branch to the trunk.</p></li>
  <li><p>Copy the trunk to the branch. What is the best way to do this without losing the branch history? Should I deprecate the branch and create a new one?</p></li>
  </ol>
  
  <hr/>
  
  <p>Okay, it looks like I didn't given SVN enough credit. It's smart enough after all. I was just put off by the output of "D" and "A", but in the background it did a move.</p>