假设我团队中的某个开发人员搁置了他在分支A中所做的更改,而我正在处理分支B。我可以将他的更改取消搁置到分支B中吗?(通过GUI或命令提示符)
发布于 2008-09-22 20:24:11
Visual Studio Power Tools应该允许您这样做。
C:\src\2\Merlin\Main>tfpt unshelve /?
tfpt unshelve - Unshelve into workspace with pending changes
Allows a shelveset to be unshelved into a workspace with pending changes.
Merges content between local and shelved changes. Allows migration of shelved
changes from one branch into another by rewriting server paths.
Usage: tfpt unshelve [shelvesetname[;username]] [/nobackup]
[/migrate /source:serverpath /target:serverpath]
shelvesetname The name of the shelveset to unshelve
/nobackup Skip the creation of a backup shelveset
/migrate Rewrite the server paths of the shelved items
(for example to unshelve into another branch)
/source:serverpath Source location for path rewrite (supply with /migrate)
/target:serverpath Target location for path rewrite (supply with /migrate)
/nobackup Skip the creation of a backup shelveset
例如,要将在Branch1上创建的名为“工具架集名称”的工具架集合并到Branch2,请使用以下命令:
>tfpt unshelve "Shelve Set Name";domain\userName /migrate /source:"$/Project/Branch1/" /target:"$/Project/Branch2/"
发布于 2008-09-22 20:23:01
工具架信息包括它所指向的特定路径。不幸的是,除了它被搁置到的位置之外,我不知道有什么自动的方法可以解除搁置到任何位置。每次我想要这样做的时候,我必须在新的分支中签出等价的文件,从旧的分支中取消搁置,然后手动复制这些文件。
编辑:嗯,我想我是在用很难的方式做到这一点。我得试试Curt的解决方案。:)
https://stackoverflow.com/questions/117337
复制相似问题