title: Merging across branches in Subversion isn't adding all the new files. Why not?
body: <p>I've got a source code tree in subversion with several branches. I've just finished a fairly intense debugging session in an otherwise active branch and now need to merge the changes across to the new branch. The new branch was taken off trunk (which represents released code) recently, after all the development in the old branch (obviously) but before I committed all my debugging. Attempting to <code>svn merge</code>, however, <em>doesn't</em> merge across all the files that were added. It adds some, but not all.</p>
  
  <p>Here's the time line:</p>
  
  <ul>
  <li>Branch off trunk to create branch dev1.</li>
  <li>Code in dev1, modifying files and adding files.</li>
  <li>Branch off trunk to create branch dev2.</li>
  <li>Bug fix in dev1, modifying files but not adding files.</li>
  <li>Merge all changes in dev1 over to dev2.</li>
  </ul>
  
  <p>As expected, there are many changes, including new files, but not all of them. Is it because the range of versions I'm merging from includes the version that made the dev2 branch? Or should I be merging to trunk and then down to dev2?</p>
  
  <p><strong>Edit:</strong> All code is fully committed into Subversion. But I think what might be happening is that file additions do not propagate through merges. That is, a prior merge <em>to</em> dev1 added a few files, but a merge <em>from</em> dev1 that encompasses the commit from the prior merge <em>does not</em> include the added files.</p>
  
  <p>But I'm still checking. </p>