Tortoise SVN：显示分支中尚未合并到主干的所有变更集？
我们开始使用开发分支和功能分支，它实际上非常有用。但是，当我们在开发分支中进行大多数错误修复时，经常会发生这样的情况：我一次处理几件事，等待我们的 QA 审查它们。现在我担心在获得许可后我会忘记将变更集/修订版合并回主干，因此错误修复实际上无法进入主干。
有没有一种方法可以显示一个分支中尚未合并回另一个分支（主干）的变更集？
谢谢。
we started working with development- and featurebranches and it is actually quite useful. But, as we do most of the bug fixes in development branches it often happens, that I work on several things at a time, waiting for them to be reviewed by our QA. Now I fear that I will forget to merge a changeset/revision back into trunk after I get clearance and so a bugfix actually doesn't find its way into trunk.
Is there a way to show the changesets from one branch that haven't been merged back to another branch (trunk) yet?
Thanks.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（4）
现在，该日志对话框（从合并对话框开始）将以灰色显示所有已从分支合并到主干的修订，并带有一个附加图标。
所有显示为黑色的修订尚未从分支合并到主干中。
Now, that log dialog (started from the merge dialog) will show you all revisions that have already been merged from the branch into trunk in gray and with an additional icon.
All revisions that are shown black were not merged yet from the branch into trunk.
使用
一个非常基本的方法是在您的功能和开发分支上 。如果有必要你可以限制
查询指定版本：
以下关于 svn 的 链接您可能也会对变更集感兴趣。
A very basic approach is to use
on your feature as well as your development branch. If necessary you can limit
the query to specified revision:
The following link about svn changesets might be interesting for you as well.
添加到斯特凡的答案中。现在，日志对话框上有一个名为 [ ] 隐藏不可合并修订的复选框。如果选中该框，您将只会看到尚未合并的修订。
因此，再次右键单击并选择合并...后，[显示日志]，然后在日志窗口底部选中[]隐藏不可合并的修订。
此外，您可以通过在对话框顶部添加一些过滤器来进一步过滤列表。
您还可以添加过滤器 -John 以排除 John 所做的更改。减号表示要从列表中排除的搜索字符串。或者，如果您想确保排除属于更改 TM1245 的更改，您可以添加过滤器 -TM1245
Adding on to Stefan's answer. There is now a checkbox on the log dialog called [ ] Hide non-mergeable revisions. If you check that box, you will only see revisions which you have not yet merged.
So again after you right click and select Merge..., [Show Log], and at the bottom of the log window check [ ] Hide non-mergeable revisions.
Additionally, you can further filter your list by adding some filters at the top of the dialog.
You can also add a filter -John to exclude changes made by John. The minus sign indicates a search string to exclude from the list. Or if you want to be sure to exclude changes that belong to change TM1245 you can add the filter -TM1245
我们推出了一项服务，该服务使用 mergeinfo 元数据来创建显示此信息的网页。因此，我们现在在配置文件（包括主干）中设置“合并路径”，并且该服务会查找尚未沿合并路径合并的未完成修订。
这非常有用。
We spun a service that uses the mergeinfo metadata to create a webpage that displays this information. So we now setup our "merge paths" in a configuration file (including to trunk) and this service looks for outstanding revisions that have not been merged along the merge paths.
It is VERY useful.