Merge into empty trunk

Hi there,

trying to merge a branch back into some empty trunk I ran into deep
trouble. That's the situation:

Add the beginning we created a repository with standard layout (trunk,
branches, tags, releases). We then started development in a newly
created sub-directory of branches (branches/student). After the student
was finished, we branched off a new branch branches/bugfix from
branches/student.

Having a stable release I want to merge the changes into trunk that is
now empty. I tried a

svn merge -r118:464 https://.../branches/bugfix

inside the trunk. This failed because branches/bugfix is not a copy of
trunk. However, if I try to do a

svn cp https://.../branches/bugfix https://.../trunk

I'm stuck with trunk/bugfix which is not correct so far!

Is there any trick to get the merges ported into trunk (besides copying
them manully using a Unix cp)?

Regards
        -michael

--
Computer Science Department 2, University of Erlangen-Nuremberg
Martensstrasse 3, D-91058 Erlangen, Germany
phone: ++49 (0)9131 85-28995, fax: ++49 (0)9131 85-28809
web: http://www2.informatik.uni-erlangen.de/~klemm