tfs - 我可以在 tfs 2008 中取消搁置到其他分支吗？

Question

假设我团队中的某个开发人员搁置了他在分支 A 中所做的更改。而我正在分支 B 上工作。我可以将他的更改取消搁置到分支 B 中吗？ (通过 GUI 或命令提示符)

Answer 1

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 上创建的名为“Shelve Set Name”的搁置集合并到 Branch2，请使用以下命令:

>tfpt unshelve "Shelve Set Name";domain\userName /migrate /source:"$/Project/Branch1/" /target:"$/Project/Branch2/"