Help me understand svn merge

Question

I do not understand svn merge. Here's the script:

We have a branch containing the latest stable copy of our code. I will consider this branch as a "branch". There is also a trunk branch that contains several new additions, but we do not want to enter into this from this point.

We have a vendor branch that contains an updated version of the library on which our application runs. I want to combine new changes in the branch of this provider with the "branch" so that we receive updates to the library, without having to go through the file through the file and find out what's new. No thanks .

Now I understand that this is probably simple, but I tried lot things and read the lot tutorials , but I still can’t wrap my head around what, I have to put up with it.

For recording, I use Tortoise.

EDIT: This is an explanation, but our application runs the library at the root level. I don't know if that matters. So, the "industry" is basically the same as the "supplier", but with our changes.

Answer 1

Something like this should do it for you. Subversion understands the standard diff and diff3 well, but it does not always work well with third-party (graphical) diff utilities.

$ cd "the branch"
$ svn merge --diff3-cmd=diff3 svn+ssh://yourrepository/path/to/vendor_branch"

Answer 2

- , , ( " " ). . ​​, , .

, , . .

, ( ) svn: externals. :

/externallib/1.0
/externallib/2.0
/project/trunk
/project/trunk/externallib

/project/trunk/externallib , - svn:externals trunk :

^/externallib/1.0 externallib 

2.0 - svn: externals:

^/externallib/2.0 externallib 

, externallib ; , /project/trunk/externallib - /project/trunk, .