如何查看SVN中文件的版本树，该树显示从分支到主干的合并? [英] How can I view the version tree for a file in SVN which shows the merges from branches back to trunk?

问题描述

我是SVN的新手，但是已经使用Clearcase多年了.

I'm new to SVN but have used Clearcase for years.

我的问题是我对分支进行了一些更改，这些更改已使用TortoiseSVN重新集成分支"功能合并回了主干.现在，当我查看版本树时，我看不到希望从分支的尖端到主干的尖端呈现任何边缘.在Clearcase中，您会看到合并箭头，指示文件/文件夹分支之间的合并方向.

My issue is I have some changes on a branch which I have merged back to trunk using TortoiseSVN "Reintegrate a branch" feature. Now when I look at the version tree I don't see any edge being rendered from the tip of the branch to the tip of the trunk, which I would expect to see. In Clearcase you would see merge arrows indicating the direction of the merge between branches of a file/folder.

这是仅仅是TortoiseSVN上的呈现问题，还是合并"仅仅是客户端操作，并且只是在主干上被视为常规更改，而不仅仅是用于描述操作的提交注释了?

Is this simply a rendering issue on TortoiseSVN or is a "merge" simply a client side operation and its just treated as a regular change on the trunk, with little more than just the commit comments to describe to operation?

这可能吗?

谢谢

菲尔

推荐答案

对于svn，分支只是另一个目录，区别在于它知道一些历史记录:它知道从哪里复制的.当您将一个分支合并到主干中时，Subversion将采取自创建(即复制)以来对该分支所做的所有更改，并将所有这些更改应用到主干.它会记住哪些更改已被合并(因此Subversion不会存储有关合并的任何内容并非完全正确)，因此知道不会再次应用它们.

For svn, a branch is just another directory, with the little difference that it knows some history: It knows where it was copied from. When you merge a branch into the trunk, Subversion will take all changes that where made to the branch since it was created (i.e. copied) and apply all those changes to the trunk. It will remember which changes have already been merged (so it's not totally true that Subversion doesn't store anything about the merges), hence knows not to apply them again.

因此，在Subversion中进行合并并不仅仅是在此处应用其他地方进行的更改而已.因此，分支图的概念不适用于Subversion(并且处理分支的方式可能是对Subversion的最经常的批评).

So, merging in Subversion doesn't mean much more than applying some changes here that were made somewhere else. The idea of the branch graph therefore doesn't work well with Subversion (and the way of handling branches is probably the most often uttered criticism of Subversion).

如果您有选择，则可能需要查看具有可用性的 Mercurial 与Subversion非常相似，但在处理分支和合并方面要好得多.

If you have the choice, you might want to look at Mercurial, which has a usability quite similar to that of Subversion, but is much better at handling branches and merges.

如果您坚持颠覆，我希望至少可以给我一点解释.另外， SVN图书是Subversion的很好的介绍，绝对是新手必读的书. Subversion用户.

If you're stuck with subversion, I hope I could at least give a little explanation. Also, the SVN Book is a very good introduction to Subversion and is definitely a must-read for new Subversion users.

这篇关于如何查看SVN中文件的版本树，该树显示从分支到主干的合并?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！