当分支合并到主干时,对分支提交的注释是否会保留?
使用 subversion v1.6.6 和 TortoiseSVN v1.6.6..
创建分支并在分支上提交时仔细添加详细注释后,在将分支合并回主干后,我似乎找不到这些注释。
注意:我们采用功能分支策略,其中所有开发都在新分支中完成,主干是创建版本的“主代码库”(集成测试后)。
那么我会丢失旧的分支评论吗?如果没有,他们在哪里?它们在 Tortoise SVn 中的什么位置可见。
提前干杯!
——李
Using subversion v1.6.6 and TortoiseSVN v1.6.6..
After having created a branch and meticuously adding detailed comments whenever doing a commit on the branch, I can't seem to find those comments after I have merged the branch back onto the trunk.
Note : We're employing a feature branching strategy where all development is done in new branches and the Trunk is the 'master code base' that releases are created from (after integration testing).
So do I loose the old branch comments? If not, where are they? Where are they visible in Tortoise SVn.
Cheers in advance!
-- Lee
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
独立于 Tortoise SVN,在分支上进行的 SVN 提交只能通过在分支本身上执行svn log来查看。合并时,提交注释实际上并未合并到目标分支(在您的情况下是主干)。
通常,您会在分支上进行提交(带有适当的注释),然后将这些更改合并到主干。理想情况下,合并到主干的提交消息应该准确描述您要合并的内容(例如功能名称和合并的修订范围)。
另请注意,从 Subversion 1.5 开始,已合并的修订版本会在服务器上自动跟踪。这称为合并跟踪(有关详细信息,请参阅 SVN 1.5 发行说明)。
Independently of Tortoise SVN, the SVN commits made on a branch can only be viewed by executing an svn log on the branch itself. The commit comments are not actually merged to the target branch (trunk in your case) when merging.
Typically, you would make commits (with appropriate comments) on your branch and then merge those changes to the trunk. The commit message for the merge to the trunk should ideally describe exactly what you are merging (for example the feature name and the range of revisions merged).
Also note that as of Subversion 1.5, the revisions that have been merged are automatically tracked on the server. This is called Merge Tracking (see the SVN 1.5 Release Notes for details).