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?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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?
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.