TortoiseSVN修订图:合并->线连接回主干? [英] TortoiseSVN Revision Graph: Merge -> line connected back to trunk?

问题描述

当我完成合并"时，TortoiseSVN修订图会在分支上画一条线到主干吗?

Does TortoiseSVN Revision Graph draw a line from Branch back to the Trunk when I finish a "Merge"?

推荐答案

进行分支是一项复制操作(在svn中非常便宜)，并且在日志中很明显是发生的事情，因此是该行. (对于svn/tortioiseSVN而言)很明显，因为如果不从所选修订版本的主干中提取所有单个工件，就无法创建分支.这就是为什么行总是存在的原因如图所示-进行分支保证可以将您的文件从主干中全部提取到分支中.合并回来的方式有所不同，您可以有选择地合并任何所需内容.

Taking a branch is a copy operation (which is very cheap in svn) and it looks obvious in the logs that is what happened, hence the line. It's obvious (to svn/tortioiseSVN) because you can't make a branch without taking every single artefact from the trunk at the revision you chose. That's why a line is always shown - making a branch is guaranteed to take all your files from the trunk into your branch. Merging back in is different, you can selectively merge in whatever you want.

重新合并不是副本，而是从HEAD(当前最新主干)到您自己的工作副本(您的分支)的差异的提交.对于SVN来说，似乎有人采用了最新的中继，并立即更改了文件负载并将其提交.

Merging back in is not a copy but a commit of your diffs from the HEAD (current latest trunk) to your own working copy (your branch). To SVN, it looks like someone took the latest trunk and changed a load of files at once and committed them in.

IMO，返回主干的行会产生误导，因为您可以为每个文件合并并选择自己的主干版本-该行暗示您已将所有更改都带进来，但是实际上并不能保证您带来任何东西.

IMO, a line going back to trunk would be misleading because you could merge and choose the trunks version over your own for every single file - the line would imply you had brought all your changes in but there is actually no guarantee you brought any in.

这篇关于TortoiseSVN修订图:合并->线连接回主干?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！