Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

how to undo pending changes of files that are unchanged?

One thing that drives me crazy with TFS is the fact that if you have a file checked out, but you made no changes to it, it still shows as a change, distracting you from real changes that you made. This is especially annoying when you use tools such as T4 to generate code, because most of the time the tool will generate the same code, but will leave the file checked out.

For some reason that I can't understand, Visual Studio insists in showing those as changes, and will even claim that there are conflicts if another person happened to check-in the same "changes".

Fortunately, the TFS Power Tools include a command that compares checked-out files with the server version and undoes the unchanged files. I will explain how to integrate it into Visual Studio using a custom tool.

This is unfortunately not available if you are using Visual Studio 2017!

It used to be very simple to accomplish this with earlier versions of Visual Studio:

tfpt uu /noget /r *

How do we remove files from pending changes if they do not have any changes?

like image 292
Alex Gordon Avatar asked Oct 10 '17 01:10

Alex Gordon


People also ask

How do I undo a pending change?

To undo all changes you have made in your solution or a code project, open the context menu, and then choose Undo Pending Change. In the Undo Pending Changes dialog box, make sure the changes you want to undo are selected, and then choose Undo Changes.

How to undo pending changes in TFS for another user?

If a team member is blocked from checking in a file that is locked by someone else, you can use the tf undo command to delete Team Foundation version control pending changes in another user's workspace. If you must also remove an exclusive lock on a file, but not the pending changes, you can use the tf lock command.

How to undo in azure devops?

Right-click that file and select Undo Changes.


2 Answers

This is different based upon your choice of version control system in TFS, so the above problem only exists for TFS' traditional version control system TFVC and not git which has been supported for a few years now.

For TFVS a partial workaround is to mark all files, right-click and Undo... and click Undo Changes button in the following dialog. This will prompt you for the files that are different (letting you choose No or No to All) but not for the ones that have no changes. Important: I write 'partial' because this approach does not work for file renames as the file is considered unchanged so the rename will be undone.

like image 182
Tore Østergaard Avatar answered Sep 17 '22 11:09

Tore Østergaard


The TFSSourceControlExplorerExtension extension is available for VS 2017 and it has an undo unchanged action that works rather nicely.

like image 39
StingyJack Avatar answered Sep 19 '22 11:09

StingyJack