如何使用Tortoise SVN将SVN合并到一个分支（SVN 1.6）中

Question

I created a branch and then made changes to trunk which need merging into the branch. TortoiseSVN has a nice handy merge branch->trunk utility, but to do it this way round do I have to manually merge specific revision ranges?

Answer 1

Bringing a branch up to date with trunk is usually very simple with SVN 1.6. This version keeps track of the specific trunk revisions already in the branch and knows how to only merge in the revisions you don't have in the branch. TortoiseSVN takes full advantage of SVN's merge tracking feature.

When merging new trunk changes into a branch, choose the "Merge a range of revisions" option. Leaving the revision range entry blank will cause Tortoise to merge all new changes from trunk without you having to figure out what revisions those are.

Here is the TortoiseSVN documentation on merge tracking .

Answer 2

如果您使用1.6创建分支，则分支将具有允许自动从主干到分支合并的信息。