Compare workspace version to shelvset version

I am trying to compare a version of a file in a shelveset (end of day yesterday) to the local workspace version of the file, in order to see what I've changed so far today.

If I go to Unshelve/Details/ and then right mouse click on the shelved file, I get a compare menu that has a grayed out option to "compare to with workspace version" but I can't find a way to ungray this option as this is exactly what I want to do! Also I have looked in the command line "tf diff" and it says that the /shelvset option cannot be combined with the itemspec option, so I can's see a way to do it that way either.

Does anyone know how I can do this

Thanks

Rob



Answer this question

Compare workspace version to shelvset version

  • ronwest99

    you may try the tfpt.exe (Team Foundation Power Toy). It has the Unshelve option that gives you the ability to merge local workspace changes with shelvesets and resolve conflicts. I am thinking that it also allows you to do a compare. I am not 100% positive on this, but it may be worth looking into.

    -paul



  • Kiwi bloke

    Unfortunately, tfpt unshelve doesn't let you compare to the local file either.

    Quickest way I can see is to choose View from the Unshelve dialog, use the associated editor to save it to disk, then run tf diff file.txt file-saved-from-shelveset.txt

  • libra08

    The thing that confuses me is that when looking at an item in a shelveset, if you right mouse click and select the compare option, you get three sub options

    • Compare with unmodified version
    • Compare with Workspace version
    • Compare with Latest version

    So this implies that there is functionality to compare a shelveset file to a workspace file as there is a menu option to do it, but unfortunately the menu option is grayed out. Can anyone confirm if they also get this option and if it is grayed out for them as well I'm 90% sure that I have the power toy installed as I installed it to get the annotate and tree diff functionality a few months back.

    I think from what you have said the functionality doesn't exist, however I am intrigued by the grayed out menu option that appears to offer me exactly what I want!

    Thanks for your help

    Rob


  • Keith Ball

    Hi Rob:

    We wanted to support it but we ran out of time to do it for that option. So the answer is the menu is there but there is no code behind to support the feature hence it gets grayed out.

    Thanks, mario



  • Compare workspace version to shelvset version