If you are like me and a fan of Shelving in TFS you are going to love TFS11.
Here are some new features for Shelving that have me excited about the next release.
Merge
Instead of a copy, unshelve is now a merge. You can take those changes and Merge them in with your current local changes. Also this means that on a Gated Check in the Shelveset is merged with the main base of code prior to the private build.
Work items
In the new Team Explorer you can select work items that are In progress. So that when you check in the changes the changeset is associated to the work item.
If you Shelve this work to do something else the Work item is stored with the Shelveset. When you Unshelve to work on it you will get the work item also.
Switch
Select a shelveset while you have work in progress. Notice the Switch command below. This allows you to take your In Progress work and swap it out with a Shelevest.