Merge From Trunk to Branch

Hello all,
 
I searched the archives and google and couldn't get a clear picture of
the right way to do what I want.
 
Let me setup and example.
 
Suppose we have a project that is using the standard structure:

FooProject
 |
 +- trunk
 |
 +- branches
 |
 +- tags

And further assume that a developer has made a branch named "Bar" under
branches.

The URL to the trunk is svn://svnserver/FooProject/trunk and the URL to
the
developer's branch is svn://svnserver/FooProject/branches/Bar.

So far so good.

The developer has been working away from the trunk for a couple of days
(bad.. I
know, but bear with me). They aren't yet ready to merge from their
branch back
into the trunk, but they want to merge from the trunk down to their
branch to
minimize the pain later and keep their branch as close to in-sync as
they can.

The developer has done 'svn log --stop-on-copy
svn://svnserver/FooProject/branches/Bar'
to figure out the repository revision of when the branch was made: 135.
The current
revision of the trunk is 164. The developer's working copy is fully
committed to his
branch.

So, again, what he wants to do is to merge all changes in the trunk
since 135 down into
his branch without changing the trunk.

What is the right way to accomplish this?

I suspect it is something like 'svn merge' from the branch to the trunk
and then
instead of committing to the trunk, doing a 'svn switch' back to the
branch,
but since I haven't used switch before I'm not 100% sure.

Can someone please help me out here? It seems like this would be a
common occurance
for people who use branches much.

Thanks in advance,

Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 14 05:57:33 2004