TFS: List changesets that have not been merged

这一生的挚爱 提交于 2019-11-30 05:58:27

问题


Environment

TFS 2010. Three branches: Main, Development and Release.

Question

I would like to easily retrieve a list of changesets that have not been fully merged into all three branches.

For Example

Lets says I have a changeset, 100, that was a bugfix and checked in directly into Release. I can use the Tracking feature to visualize that it exists only in Release.

But that requires me to know to look at that changeset. I'm looking for a generic list that would show me any changeset that exists in one branch, but not in all three.

What I know

I know I can compare Release to Main to see the differences. Is that my only option?

I try to associate changesets with work items, so I could query a list of non-closed work items and then as a 'rule', I could verify that a changeset has been fully merged before closing it. And perform code compare to verify.


回答1:


You can get a simple list of changesets through the IDE by choosing the "Selected Changes" option when merging things onto a build.

Another option is to use the API. VersionControlServer has a property named GetMergeCandidates which returns an array of MergeCandidate which has the changeset and if it has been partially merged already as properties.




回答2:


From the Developer Command Prompt, you can also use the tf.exe merge command.

tf merge /candidate /recursive Release Main

will show you all the changesets that were made to Release but haven't been merged into Main.



来源:https://stackoverflow.com/questions/4995576/tfs-list-changesets-that-have-not-been-merged

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!