Copying only files that changed from branch into trunk

Hi everyone!

I have the following situation:

A branch has been created and worked on. At the same time work has
been done on trunk. However, it turns out, that only those files that
changed the in branch should now be taken.

So basically I just want to copy everything that changed in the
branch into trunk, no matter what has been done on the corresponding
files in trunk.

There are a lot of files where this happened, so copying each changed
file by hand is the last resort. Is there a faster way of doing this?

Cheers, Ingo =;->

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 2 23:10:26 2007