Help w/Merging/Tagging

Hi, I have a question about how to properly do merging/tagging. The
situation is this: we have a main branch, named for the part of the
year, Q2. We have a tag for a specific configuration of that branch,
UAT2. That tag was cut too early, and now many changes need to be
merged into it. Since these are not things that should be present in
HEAD of Q2, I currently have them in a local source tree, which is
composed mostly of explicit checkouts of earlier revisions, but
partially of directories switched to HEAD, plus the occasional local
edit.

I would now like to check this entire tree back into the UAT2 tag, but
I can't figure out how. I get the impression it would something along
the lines of "svn merge ./UAT2 ./Q2-custom ./UAT2", but that gives a
message about needing revision numbers specfied, and I don't know what
revisions to use. Is this the right approach, and if so, how exactly
do I do it? Any help would be much appreciated!

-- 
Aaron Davies
aaron.davies@gmail.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org