TFS 分支/合并满足历史视图
我们在最近从 VSS TFS 系统迁移到的开发“主干”中进行了设置,开发人员一直在主干的分支中工作,这些分支被合并回来。
我们一直在努力评论我们的变更集:及时登记,这是我们在 VSS 时代从未做过的事情。 但是,当我右键单击源代码管理资源管理器中的主干文件并选择历史记录时,我只看到标记为“从开发分支合并”的整体变更集(或开发人员在合并时在其中潦草写下的任何内容)。历史记录条目不会甚至似乎包含当时合并的哪个分支的信息,更不用说有关组成它的变更集或与之相关的注释的任何信息了。
其他 TFS 用户如何处理这个问题?
还有其他方法可以查看我在这里丢失的历史吗?
We have a setup with a development "trunk" in our recently-migrated-to-from-VSS TFS system and developers have been doing work in branches off the trunk, which are merged back in.
We've been diligently commenting our changesets at check in time, something we never did in the VSS days. However when I right-click on a trunk file in the Source Control Explorer and choose History, I only see monolithic changesets labeled "merge from dev branch" (or whatever the developer scribbled in there when they merged.) A history entry doesn't even seem to contain info on which branch was merged in at that time, let alone any info about the changesets that make it up, or the comments that go with them.
How have other TFS users dealt with this issue?
Is there another way to view the history that I'm missing here?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(3)
查看合并之前的更改历史记录一直是 TFS 的一个痛点。 以至于微软在下一个版本的TFS(TFS 2010)中做了很多工作来解决这个问题。 在 TFS 2010(当它发布时)中,当您在历史视图中进行合并时,实际上有点麻烦,您可以展开并查看已合并内容的历史记录,这要好得多。
与此同时,当我看到大的整体合并(或分支)注释时,我倾向于发出一声叹息,然后在源代码管理资源管理器中找到合并的分支中的文件,并在那里查看历史记录。
Looking at the history of a change prior to the merge has been a bit of a pain point with TFS. So much so that Microsoft have done a lot of work to address this in the next version of TFS (TFS 2010). In TFS 2010 (when it comes out), when you get to a merge in the history view it is actually a little twistie that you can expand and go see the history for the thing that was merged which is much nicer.
In the meantime, when I see I big monolithic merge (or branch) comment I tend to let out a audible sigh and then go find the file in the branch it was merged from in Source Control Explorer and do a view history there.
这可能就是您正在寻找的内容: http://www.codeplex.com/TFSBranchHistory
还没有我个人使用过它,所以我不能保证它。
This might be what you are looking for: http://www.codeplex.com/TFSBranchHistory
Haven't used it personally, so I can't vouch for it.
访问 Microsoft Gallery 上的“TFS Branched History”插件页面:
http://visualstudiogallery .msdn.microsoft.com/7d4f37b6-f9a4-44c6-b0a0-994956538a44
插件确实将“分支历史记录”按钮插入到源代码管理资源管理器 (TFS) 的上下文菜单中
该按钮图标带有时钟,就像标准“历史记录”一样但带有蓝色箭头:
如果单击“Branched History”,将打开新窗口,并且 Path 属性将被设置为当前源代码管理资源管理器路径:
单击“运行查询”以在“历史记录”中获取结果选项卡:
从上下文菜单中,您可以查询标准变更集详细信息和比较文件(文件夹)对话框。
Visit "TFS Branched History" plugin page at Microsoft Gallery:
http://visualstudiogallery.msdn.microsoft.com/7d4f37b6-f9a4-44c6-b0a0-994956538a44
Plugin does insert "Branched History" button into the context menu of Source Control Explorer (TFS)
The button icon is with clock like standard "History" but with blue arrow:
If you click "Branched History", new window will be opened and Path property will be set to the current Source Control Explorer path:
Click "Run query" to get results at the "History" tab:
From context menu you can query standard Changeset Details and Compare File (Folder) dialogs.