change existing branch to match trunk head?

I'm struggling with a simple problem.

I've been doing all my coding on a working copy of the main-line in
"trunk." Now I need to check in my code, but I only have write access
to another branch created for me some months ago which is far out of
date. How should I get my working copy of "trunk" checked in under my
branch?

I tried to start by updating my old branch to the current trunk by doing:
svn merge https://x.com/svn/project/branches/mybranch/
https://x.com/svn/project/trunk/ working_copy_of_mybranch
This took almost 2 hours (there are about 3000 files) but didn't work
anyways. Somehow there were conflicts, even though
working_copy_of_mybranch was a fresh, unmodified checkout of mybranch.
There must be a better way to go about this.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 27 07:23:39 2006