Is there a way to clear all of my TFS pending changes?

Question

If I unshelve a shelveset, the "Pending Changes" toolwindow in Visual Studio will restore the files, the commit comment, and the associated work items I had set up when I shelved.

If I change my mind and decide I'm not ready to work on this shelveset right now -- for example, if I have to drop everything and fix a bug -- is there any way I can clear all of this state at once?

It's easy for me to highlight all the files, right-click, and "Undo". But that only reverts the files; I still have to go in and erase the comment, then switch to the Work Items page, possibly select a different query to make sure I see the work item that I was associated with, and uncheck the box.

Is there a button, menu item, or VS extension that will let me revert the file changes and the commit comment and the list of work items, all at once, and leave me with a totally clean slate to work on something else?

Answer 1

I am not at the office to check this out, but it's worth a shot:
Shelve your changes into a new shelveset, keeping in mind to uncheck the "Preserve pending changes locally".

Answer 2

In the next version of Visual Studio it will be a much nicer experience. Check out the session by Jamie Cool on this topic