Eclipse CVS 合并是否出现在文件的日志视图中？
我对分支/合并的想法并不陌生，但我对 CVS 很陌生。我有一个从主干分支出来的示例文件，并对分支和主干进行了不冲突的编辑。
然而，当我进入合并时，该过程将我的所有更改保留在一个文件中，代表主干的最新版本。当我提交此文件时，SmartCVS 中文件的“日志”显示更改已提交，但这并不意味着分支已带回到主干中。
我是否真的会在日志视图中看到这一点，或者合并的概念是否必须在标签或签入注释中表示？
谢谢！
IVR复仇者
I'm not new to the Branch/Merge idea, but I'm new to CVS. I have a sample file that I have brached off of the main trunk, and have made non-conflicting edits to both the branch and the main.
When I go to Merge, however, the process leaves me with all of my changes in a file representing the latest revision of the Main trunk. When I commit this file, the "log" for the file in SmartCVS shows me that the changes have been committed, but it doesn't signify that the branch has been brought back into the Main trunk.
Will I actually see this in the log view, or is the notion of a merge something that has to be represented in tags or check-in comments?
Thanks!
IVR Avenger
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
CVS 不会自动跟踪合并。为此，您必须采用自己的评论和/或标记方案。
根据我的经验，我们确保每个合并的人都添加注释以表明合并的来源。这很费力。
CVS does not track merges automatically. In order to do this you will have to adopt your own comment and/or tagging scheme.
In my experience we made sure everyone who merged added comments to indicate where the merge had come from. It was labourious.