Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

TFS: comparing shelveset files with local version

Tags:

tfs

When viewing files in a shelveset, I would like the option of comparing the files to my current local version. Unfortunately, the only options available are "With Unmodified", "With Workspace" (I guess this one would be the answer, if it wasn't disabled) and "With Latest".

Any ideas?

like image 875
danijels Avatar asked Oct 06 '08 08:10

danijels


People also ask

How do you check in code with Shelveset?

In the combobox “What do you want to build?”, select “Latest sources with shelveset”. If you go to the button “…” you can select any shelveset from anyone. Then check the box “Check in changes after successful build”.

How do I get TFS code from Shelveset?

If you click on the branch/folder in Source Control Explorer, right click, go to Find, then click Find Shelvesets as you do to see them, and then when you find the shelveset you want to look at, right click on it in your team explorer window and choose "Unshelve".

How do you Unshelve a Shelveset in Visual Studio?

To unshelve the shelveset from someone else you go to Team Explorer -> Pending Changes. You then select the Action link next to Shelve and select Find Shelvesets. By default, you'll now see the shelvesets that are found for your user account.


2 Answers

Export Shelveset to a local folder using Team Foundation Sidekicks and use file comparison tool to compare with local version.

like image 57
jnesis Avatar answered Sep 21 '22 06:09

jnesis


Up to How can I easily diff/compare 2 shelvesets in TFS?

Use VS2013 ShelvesetComparer or VS2012 ShelvesetComparer, shelve local version into another shelveset, then compare between two shelvesets...

Though this will make another unneeded shelveset, and you can't edit local in file compare editor.

like image 20
ChrisTorng Avatar answered Sep 22 '22 06:09

ChrisTorng