How to merge a part of the whole tree

We have this kind of use case:

The original code for the product (this is also our own code) is maintained in a vendor branch. When we change some of that code we copy the file from vendor branch to trunk (directory structure is maintained) and then do the changes.
- This is done because we can now compile the original product and our changes to different packages and deliver these both to user how is running our changes on top of the original product.

Now what we would like to do is to bring possible changes from vendor branch (current-directory) to our development branch (trunk) when product is upgraded -> Trunk may have only few files and directories while the original product has thousands of them.

Now we obviously get a lot of tree conflicts because our development branch only includes a part of the original tree. I can see that there can be a problem if file is deleted, moved or renamed in the original product but that happens so rarely that it isn't a real problem.

QUESTION:
========
Is this possible: merge changes only to the changed files or somehow easily discard the tree conflicts? Optimal solution would be if it was somehow possible to tell svn to "get changes for files under trunk from differences between these two URLs (current and previous version of the original product)".

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2407478

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-14 13:08:01 CEST