{"id":10295,"date":"2005-11-16T12:16:56","date_gmt":"2005-11-16T17:16:56","guid":{"rendered":"http:\/\/devblogs.microsoft.com\/buckh\/?p=10295"},"modified":"2019-05-06T12:17:53","modified_gmt":"2019-05-06T16:17:53","slug":"power-toy-tfpt-exe","status":"publish","type":"post","link":"https:\/\/devblogs.microsoft.com\/buckh\/power-toy-tfpt-exe\/","title":{"rendered":"Power Toy: tfpt.exe"},"content":{"rendered":"

[UPDATE 8\/9\/2007]<\/strong>  I fixed the broken link to the power tools page. <\/p>\n

[UPDATE 9\/8\/2006]<\/strong>  TFPT is now available in its own small download: http:\/\/go.microsoft.com\/?linkid=5422499<\/a>!  You no longer need to download the VS SDK.  You can find more information about the September ’06 release here<\/a>.<\/p>\n

Back at the start of October, I wrote about the tfpt.exe power toy<\/a>.  The beta 3 version has been released with the October SDK release<\/a>.  In the future, we plan to have a better vehicle for delivering it.<\/p>\n

Here’s the documentation, minus the screenshots, in case you are trying to decide whether to download the SDK.  The documentation is included in the SDK release as a Word document, including screenshots of the various dialogs (yes, most commands have a GUI, but you can still use the commands from scripts by specifying the \/noprompt option).<\/p>\n

Review<\/strong>  The only command not documented is the review command, which is very handy for doing code reviews.  When you run “tfpt review” you get a dialog with a list of your pending changes that you can check off as you diff or view each one.<\/p>\n

I hope you find these useful.  Please leave a comment, and let us know what you think.<\/p>\n

\n
\n

Team Foundation PowerToys<\/span><\/p>\n

<\/span><\/p>\n

Introduction<\/p>\n

<\/span><\/b><\/p>\n

The Team Foundation PowerToys<\/span> (TFPT) application provides extra functionality for use with the Team Foundation version control system. The Team Foundation PowerToys<\/span> application is not supported by Microsoft.<\/p>\n

Five separate operations are supported by the TFPT application: unshelve,<\/span> rollback, online, getcs<\/span>, and uu<\/span>. They are all invoked at the command line using the tfpt.exe application. Some of the TFPT commands have graphical interfaces.<\/p>\n

Unshelve (Unshelve + Merge)<\/p>\n

<\/span><\/b><\/p>\n

The unshelve operation supported by tf.exe does not allow shelved changes and local changes to be merged together. TFPT’s<\/span> more advanced unshelve operation allows this to occur under certain circumstances.<\/p>\n

If an item in the local workspace has a pending change that is an edit, and the user uses TFPT to unshelve a change from a shelveset, and that shelved change is also an edit, then the changes can be merged with a three-way merge.<\/p>\n

In all other cases where changes exist both in the local workspace and in the shelveset, the user can choose between the local and shelved changes, but no combination of the changes can be made. To invoke the TFPT unshelve tool, execute<\/p>\n

<\/p>\n

<\/span><\/p>\n

tfpt<\/span><\/span> unshelve<\/span><\/p>\n

<\/span><\/p>\n

at<\/span> the command line. This will invoke the graphical interface for the TFPT unshelve tool:<\/p>\n

Running TFPT Unshelve on a Specified Shelveset<\/b><\/p>\n

To skip this dialog, you can specify the shelveset name and owner on the command line, with <\/p>\n

tfpt<\/span><\/span> unshelve shelvesetname<\/i>;shelvesetowner<\/i><\/span><\/span><\/p>\n

<\/span><\/i><\/p>\n

If you are the owner of the shelveset, then specifying the shelveset owner is optional.<\/p>\n

Selecting Individual Items Within<\/span> a Shelveset for Unshelving<\/b><\/p>\n

If you specify a shelveset on the command line as in “Running TFPT Unshelve on a Specified Shelveset,” or if you select a shelveset in the window above and click Details, you are presented with the Shelveset Details window, where you can select individual changes within a shelveset to unshelve.<\/p>\n

You can check and uncheck the boxes beside individual items to mark or unmark them for unshelving. Click the Unshelve button to proceed.<\/p>\n

Unshelve Conflicts<\/b><\/p>\n

When you press the Unshelve button, all changes in the shelveset for which there is no conflicting local change will be unshelved<\/span>. You can see the status of this unshelve process in the Command Prompt window from which you started the TFPT unshelve tool.<\/p>\n

There may, however, be conflicts which must be resolved for the unshelve<\/span> to proceed. If any conflicts are encountered, the conflicts window is displayed:<\/p>\n

Edit-Edit Conflicts<\/p>\n

<\/b><\/p>\n

To resolve an edit-edit conflict, select the conflict in the list view and click the Resolve button. The Resolve Unshelve Conflict window appears.<\/p>\n

For edit-edit conflicts, there are three possible conflict resolutions. <\/p>\n