title: How to svn-merge a directory into a branch where it originally didn't exist
body: <p>Suppose the following structure on an svn server:</p>
  
  <pre><code>-svn-|
       |-trunk --- |
       |           | - dirA
       |           | - dirB
       |
       |-branches -|
                   | - foo - |
                             | - dirA
  </code></pre>
  
  <p>At a revision X, the foo branch was created from the trunk. Some time later at revision Y, directory dirB was created in the trunk. Now, at revision Z, i want to integrate dirB (rev Z) into the foo branch.</p>
  
  <p>I tried:</p>
  
  <pre><code>md dirB
  svn add dirB
  svn merge --dry-run --force ssh://server/svn/trunk/dirB dirB
  </code></pre>
  
  <p>and</p>
  
  <pre><code>svn merge -rY:Z--dry-run --force ssh://server/svn/trunk/dirB dirB
  </code></pre>
  
  <p>and also</p>
  
  <pre><code>cd dirB
  svn merge --dry-run --force ssh://server/svn/trunk/dirB .
  </code></pre>
  
  <p>Everytime I get </p>
  
  <pre><code>Summary of conflicts:
    Tree conflicts: 34
  </code></pre>
  
  <p>How to do this merge?</p>