Merging overlapping repos

I looked around a bit, but couldn't find anything that definitively
answered my question.

I have a repo that I've been using while working for a client; the
client now wants to host a repo on their servers, and merge my work
with that of another programmer they have. None of my actual work
overlaps with the other programmer, but the structure of our repos
do. That is, both repos have, at their root:

/trunk/
/branches/
/tags/

All the stuff in my "trunk" is different than what's in the other
"trunk". When I dump my repo and then load it into their repo, will
it merge correctly (that is, my "trunk" will NOT overwrite their
existing "trunk")?

Or do I need to dump the *contents* of my "trunk", and then load that
into their "trunk"?

Thanks!

-- 
randy
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org