directory cleanup branch?

I have a subversion project that is beginning to get rather large and I need
to restructure the directories. To do this I cut a branch off of the trunk
just to reorder the directories and modify the build system to compensate. I
now have my branch how I want it and I want to merge my changes back in.

The problem is that as I've been messing with these cleanups, the other
developers have been commiting changes on the trunk. When I try to merge:

"svn merge -r2721:2740 https://<server>/<project>/branches/dircleanup"

into the a trunk WC, all of the commits to the moved source files disappear.
Most of what I'm trying to commit are not changes to files, but changes to
directories. Is this possible? Am I mistaken about how svn versions
directories?

Brett
Received on Sat Feb 11 16:50:00 2006