How to svn-merge a directory into a branch where it originally did not exist

Question

Assume the following structure on an svn server:

-svn-| |-trunk --- | | | - dirA | | - dirB | |-branches -| | - foo - | | - dirA 

In edition X, the foo branch was created from a trunk. Some time later, in the Y edition, the dirB directory was created in the tube. Now, with revision Z, I want to integrate dirB (rev Z) into the foo branch.

I tried:

 md dirB svn add dirB svn merge --dry-run --force ssh://server/svn/trunk/dirB dirB 

and

 svn merge -rY:Z--dry-run --force ssh://server/svn/trunk/dirB dirB 

and

 cd dirB svn merge --dry-run --force ssh://server/svn/trunk/dirB . 

Every time i get

 Summary of conflicts: Tree conflicts: 34 

How to do it?

Answer 1

Make sure you are working on a working copy of dirA

 cd branches/foo/dirA 

Combine dirB in foo/dirA

 svn merge ssh://server/svn/trunk/dirB . 

EDIT:
Branches are created using svn cp :

 svn cp ssh://server/svn/trunk/dirB ssh://server/svn/branches/foo/dirB -m"dirB branch created"