When you do a commit instead of a shelve in TFS...

1. Make a copy of the folder with your gunk elsewhere on your computer.
2. Rollback in TFS to the number of your commit and not the number beforehand. (I made that mistake and undid someone else's commit.)
3. Paste your copied-away stuff back into the source code.
4. Use this "Check Out for Edit..." trick to find your fixes anew.
5. Make a shelf.