Let's assume that some developer in my team shelved his changes that he did in branch A. And I am working on branch B. Can I unshelve his changes into branch B? (By GUI or command prompt)
A:
The shelf information includes the specific path it goes to. Unfortunately I don't know of any automatic way to unshelve to any location other than the one it was shelved to. The times I've wanted to do this I had to check out the equivalent files in the new branch, unshelve from the old branch, then manually copy the files over.
EDIT: Well, I guess I was doing it the hard way. I'll have to try out Curt's solution. :)
Herms
2008-09-22 20:23:00
+31
A:
The power tools should let you do this.
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
Curt Hagenlocher
2008-09-22 20:24:11
Ooohhh...Curt, I think you just made my day. I'm going to have to try that later.
Herms
2008-09-23 13:46:50
Where do you get the power tools from?
Guy
2009-01-14 23:10:47
Yep, the power tools SHOULD let you do this, but unfortunately the merge goes horribly wrong each time so it's next to useless.
apathetic
2009-08-06 10:57:17
The merge isn't that bad. I found that Auto Merge works in 90% of the cases.
Justin Rudd
2009-12-07 22:13:05
The power tools can be freely downloaded from some MSDN site. Use Google or Bing to find the right site -- that's what I need to do, too.
Curt Hagenlocher
2010-01-31 17:58:21
Just tried it. I moved many files within the shelfset and unfortunately this doesn't seem to work well . You need to manually "migrate" all these files (there is also no multi-select). And then they are added as new files to the workspace. I can't use it, because I can't merge it anymore.
Stefan Steinegger
2010-05-18 12:20:35
+1
A:
Masterful. :) Um, 'auto merge'? Yeah, cause that's what I want to do, trust a tool to decide conflicts for me. :) If that's what you mean by 'the merge goes horribly wrong', it's time to spend a bit more than 30 seconds recovering your shelfsets. :)
Much better than copying the files over and having No Idea wtf the changes were. :)