TFS 变更集编号后附加星号的含义是什么
我正在查看合并的候选变更集,并得到一些我不明白的输出:
tf merge /candidate /recursive $/Acme/Branches/Release/3.5 $/Acme/Trunk
Changeset Author Date
--------- -------------------------------- ----------
47829* nate:14 4/16/2009
变更集编号末尾的 * 是什么意思?
I am looking at candidate changesets for a merge and I get some output I don't understand:
tf merge /candidate /recursive $/Acme/Branches/Release/3.5 $/Acme/Trunk
Changeset Author Date
--------- -------------------------------- ----------
47829* nate:14 4/16/2009
What does the * at the end of the changeset number mean?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(3)
它表明部分合并已完成。
It indicates a partial merge was done.
详细说明 Randy 的答案:部分合并意味着 #47829 中的一些更改已经被合并,但其他更改尚未合并。
tf merges 使用相同的语法。从 2008 年开始(或者可能是 2005 SP1?),还有一个 /format:detailed 参数,它将逐项枚举合并历史记录。
To elaborate on Randy's answer: a partial merge means that some of the changes in #47829 have already been merged but others have not.
tf merges uses the same syntax. Starting in 2008 (or maybe it was 2005 SP1?) there's also a /format:detailed parameter that will enumerate the merge history item-by-item.
根据我的经验,这意味着这些变更集已经从源分支本地合并到目标分支,但尚未在目标分支上签入更改。如果您签入目标分支上的待处理更改,然后运行“tf /merge /candidate ...”,则不应有任何带有星号的项目。
In my experience it means those changesets have already been merged from the source branch to the target branch locally, but the changes have not been checked in on the target branch yet. If you check in pending changes on the target branch and then run "tf /merge /candidate ..." you shouldn't have any items with an asterisk.