In Team System, I have a file that was changed in branch ServicePack\2.1 (which was branched from Integration) and I don't want to merge it to Integration. How do I delete it from the potential changeset list when I try to merge selected changesets?
在Team System中,我有一个在分支ServicePack \ 2.1(从Integration分支)中更改的文件,我不想将它合并到Integration。当我尝试合并所选的变更集时,如何从潜在的变更集列表中删除它?
3 个解决方案
#1
Assuming you want to remove candidate #1234...
假设您要删除候选人#1234 ...
tf merge ServicePack\2.1 Integration /r /version:1234~1234 /discard
tf checkin
#2
In Team Foundation Server 2010, you can discard changesets from a merge with this syntax:
在Team Foundation Server 2010中,您可以使用以下语法从合并中放弃更改集:
tf merge "$/[Source Branch]" "$/[Target Branch]" /r /version:[Version] /discard
#3
While you can't "delete" a merge candidate, it is possible, when merging that file, to select the "accept target version" option.
虽然您无法“删除”合并候选项,但在合并该文件时,可以选择“接受目标版本”选项。
This will mark the file as merged, but not make any changes to the target. While not the most elegant of solutions it'll do what you need.
这会将文件标记为已合并,但不会对目标进行任何更改。虽然不是最优雅的解决方案,但它可以满足您的需求。
#1
Assuming you want to remove candidate #1234...
假设您要删除候选人#1234 ...
tf merge ServicePack\2.1 Integration /r /version:1234~1234 /discard
tf checkin
#2
In Team Foundation Server 2010, you can discard changesets from a merge with this syntax:
在Team Foundation Server 2010中,您可以使用以下语法从合并中放弃更改集:
tf merge "$/[Source Branch]" "$/[Target Branch]" /r /version:[Version] /discard
#3
While you can't "delete" a merge candidate, it is possible, when merging that file, to select the "accept target version" option.
虽然您无法“删除”合并候选项,但在合并该文件时,可以选择“接受目标版本”选项。
This will mark the file as merged, but not make any changes to the target. While not the most elegant of solutions it'll do what you need.
这会将文件标记为已合并,但不会对目标进行任何更改。虽然不是最优雅的解决方案,但它可以满足您的需求。