Menu
I'm about to merge certain revisions from trunk into a release-branch. I've checked with mergeinfo how many revisions are eligible to get merged, and that were 42. Although it's definitely possible and not too hard to check each revision log and decide whether it should be merged or not. I would then check the logs with TortoiseSVN and use the command line svn merge -c rev1,rev2 function or -r for ranges of course.
I was wondering if TortoiseSVN has a tool to make this cherrypicking a lot easier. I've googled for it, but found out that only probably TortoiseGit has it.
Any other methods which makes this process easier (and faster) are also welcome!
361
To merge a range of revisions, use svn merge -r start:end from to where start and end are revision IDs. This will merge all revisions starting at start+1 up to and INCLUDING end . Note: it will NOT include the first revision (ex: -r3:45 will merge 4 through 45).
Have a local checkout of the branch to which you want to merge a range of revisions from a source branch. By default, "Merge a range of revisions" is clicked. Click Test Merge to check if it merges desired revisions/files.
I know nothing about TortoiseGit but TortoiseSVN has quite a decent "Merge" dialogue. In the "Revision range to merge" section, select "Show log" and chose as many revisions as you want:
Additionally, revisions that are already merged will be grayed-out:
133
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
