title: Subversion merge local changes trunk to branch
body: <p>In my local Subversion working copy, I have a copy of trunk and of a code branch. I've made changes in the trunk, and want to copy these changes to my (currently clean) local copy of the branch.</p>
  
  <p>I know I can check in the code to trunk, then use <code>svn merge</code> to get the changes onto the branch, but is there some way of doing this without first checking the changes in?</p>
  
  <p>Sadly, diff/patch won't work, as there are changes in the code surrounding my changes between trunk and branch. I know <code>svn merge</code> can cope with those, but as I say, I'd rather not have to check my changes in first.</p>
  
  <p><strong>Edited to add an example:</strong></p>
  
  <p>The trunk has a file containing the following:</p>
  
  <pre><code>File in trunk:                       File in branch:
  apple                                apple
  orange                               banana
  pear                                 pear
  </code></pre>
  
  <p>In trunk, I add <code>dragon fruit</code> below <code>pear</code> in the trunk file on my working copy. Were I to check that change in and use merge to copy it to branch, Subversion would correctly add <code>dragon fruit</code> below <code>pear</code> in the branch version of the file.</p>
  
  <p><code>svn diff</code> on my copy of the trunk file produces something similar to the following:</p>
  
  <pre><code>Index: fruit.txt
  ===================================================================
  --- fruit.txt  (revision 56)
  +++ fruit.txt  (working copy)
  @@ -1,3 +1,4 @@
   apple
   orange
   pear
  +dragon fruit
  </code></pre>
  
  <p>Clearly using patch won't work, as it notices the difference between the non-changed texts.</p>
  
  <p>What I <em>want</em> to happen, without having to check anything in, is to have <code>dragon fruit</code> listed after <code>pear</code> in both files, but not to have the <code>orange</code>/<code>banana</code> difference changed on either file.</p>