TortoiseSVN 樱桃采摘 [英] TortoiseSVN cherrypicking

问题描述

我准备将某些修订从主干合并到一个发布分支.我已经用 mergeinfo 检查了有多少修订版可以合并，那是 42 个.尽管检查每个修订日志并决定是否应该合并它绝对是可能的并且不太难.然后我会用 TortoiseSVN 检查日志并使用命令行 svn merge -c rev1,rev2 函数或 -r 当然范围.

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.

我想知道 TortoiseSVN 是否有一个工具可以让这个挑选更容易.我用谷歌搜索过，但发现只有 TortoiseGit 有它.

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!

推荐答案

我对 TortoiseGit 一无所知，但 TortoiseSVN 有一个相当不错的合并"对话.在要合并的修订范围"部分中，选择显示日志"并根据需要选择任意数量的修订:

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:

这篇关于TortoiseSVN 樱桃采摘的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！