title: How to svn merge branch to trunk including both file deletes and file adds?
body: <p>Use of "svn merge --reintegrate" successfully merged branch back to trunk with regards to branch files deleted being deleted on the trunk as well. This is what I expected and wanted. Good.</p>
  
  <p>However it did not add files to trunk that were added on the branch.  While "svn merge --reintegrate" <strong>copied</strong> the added file to the trunk working directory they were not added to svn and of course were not committed.  I did not expect this.  Bad.</p>
  
  <p>How can I safely merge branch to trunk changes including file deletes and file adds? </p>
  
  <p><strong>Here Is What I Did</strong></p>
  
  <p>The my-bug-fix branch was created from the last official release on the trunk.  This is a single developer project but I still managed to mess up the merge and break the build.</p>
  
  <p>Before merging I checked out both branch and trunk into a "staging" folder to make it easy to a diff.  I was hoping the diff would assure me the merge was what I expected before committing. Unfortunately diff had no knowledge that the added file had not been added to svn.</p>
  
  <pre><code>mkdir merge-staging
  cd merge-staging
  svn co https://myserver.com:8443/svn/myproject/branches/my-bug-fix/ branch
  svn co https://myserver.com:8443/svn/myproject/trunk/ trunk
  cd trunk
  svn merge --reintegrate https://myserver.com:8443/svn/myproject/branches/my-bug-fix/
  echo Perform diff between branch and trunk to verify the trunk now matches branch.
  diff -r  --exclude=".svn" branch/ trunk/
  
  svn --version
  svn, version 1.6.15 (r1038135)
     compiled Nov 25 2010, 00:08:34
  
  [esutton@esutton-vm-rhel merge]$ svn status trunk
  X       trunk/common/externals
  ?       trunk/common/scripts/strip-dbg-sym.sh
  </code></pre>
  
  <p>Thanks in advance for any direction,
  -Ed</p>