Menu
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?
937
Creating Branches in TortoiseSVN To create a branch with TortoiseSVN, select the folder in your working copy which you want to copy to a branch or tag, then right-click and select the command TortoiseSVN → Branch/Tag....
Examples. Merge a branch back into the trunk (assuming that you have an up-to-date working copy of the trunk): $ svn merge --reintegrate \ http://svn.example.com/repos/calc/branches/my-calc-branch --- Merging differences between repository URLs into '. ': U button.
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.
90
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
