Along with branching, merging is the issue that regularly causes Apache Subversion users the most confusion – but merging needn’t be complicated! In this post, we’ll show you how to successfully perform a merge in less than ten steps, using TortoiseSVN’s ‘merge a range of revisions’ option.
Tip. Two common scenarios where this type of merge comes in handy are sync’ing a development branch by applying all the latest changes from its ‘parent’ branch; and cherry-picking specific changes to add to your release branch.
To merge a range of revisions:
1) Right-click on the file you wish to merge and open the ‘TortoiseSVN’ menu.
2) Select ‘Merge’ from TortoiseSVN’s sub-menu.
3) Select the ‘Merge a Range of Revisions’ option.
4) In the ‘Merge’ dialog, select the desired URL using the “….” button.
5) Either specify the revision numbers you wish to merge, or leave the revision range blank to merge all outstanding changes from the specified source.
6) Once you have entered all the relevant information, click ‘Next.’
7) TortoiseSVN will open the ‘Merge options’ dialog. In most instances, the default settings can be used.
8) Select ‘Merge’ to perform your merge!
Need more info on branching and merging in Subversion? This year’s Subversion Live series of conferences features a session dedicated to Branching and Merging Best Practices. Visit http://www.wandisco.com/svn-live-2012 to find out more.