120

I'm using Team Foundation Server 2010 with Visual Studio 2010.

Whenever I modify a file outside of Visual Studio, TFS doesn't seem to detect the change done to the file, and thus doesn't offer me the option to check-in the file after it has been modified.

How can this be solved?

Edward Thomson
  • 74,857
  • 14
  • 158
  • 187
  • 18
    Subversion or Git (and maybe others) are comparing hashes of files instead of API to check in/out a file. Far more simpler, and far less risky ! – Steve B Mar 27 '13 at 16:20
  • 8
    worse TFS doesn't even noticed a changed file needs to be checked in, so you can often forget it.. until your colleague checks it out and realises your code doesn't compile or work. No wonder people say TFS is "VSS on steroids" - better, but still got many of VSS's problems. – gbjbaanb Apr 23 '13 at 18:45
  • It's VSS on steroids, in the same way that steroids destroy your body. – Ian Kemp Jun 30 '20 at 14:56

11 Answers11

173

TFS has a "Reconcile" command for this:

  1. Open the Source Control Explorer
  2. Right-click on the folder with the changes and choose Compare
  3. Select the files you want to reconcile (press CTRL+A to select all files)
  4. Click on the Reconcile button
  5. Set the options in the Reconcile Folder Differences dialog. Make sure Files that do not have pending changes is set to Check Out
  6. Click OK
  7. If you have local changes the Check Out dialog will be shown. Set the preferred Lock type
  8. Click Check Out

Reconcile Folder Differences

See also: Reconcile differences between folders

mhu
  • 17,720
  • 10
  • 62
  • 93
  • 13
    This is the best answer as it does not require the command line or a risky 'Undo pending changes'. – NickH Jan 27 '15 at 15:18
  • 4
    Saved my day! I followed your steps precisely and it worked exactly as expected. :-) – Gilad Barner May 11 '15 at 11:15
  • 4
    Worked as described. Should be the best answer. – Nicolas Oct 22 '15 at 09:05
  • Unfortunately, when doing this over my whole project, I get the error **The specified path, filename, or both are too long. The fully qualified name must be less than 260 characters, and the directory name must be less than 248 characters.** Selecting individual folders is not an option for me, because I cannot remember all the files directories that I have changed. Any idea? – kraftwer1 Dec 30 '15 at 11:14
  • @kraftwer1: Try moving your workspace to a folder with a short name in the root of the drive (for example `C:\TFS`) – mhu Dec 30 '15 at 19:50
  • I'm afraid you need to tweak your folder/path structure first then. – mhu Jan 01 '16 at 10:18
  • 2
    Working perfectly in VS 2015 update 3, thanks a lot. Should be the best answer, no tricky commands to make it works – Nicolas Leucci Aug 01 '16 at 13:58
  • Why no the delete command for the files that on server only (not in your workspace) ? – 23W Nov 30 '16 at 13:53
  • I now have over over 750 marked changes instead of 15 or so, not sure how this worked for everyone? I can't check this in and have to dig through and undo changes on almost everything! – CincinnatiProgrammer Jul 28 '17 at 13:35
  • Why does it lack the option "replace server version with local version" ... incredible crap. – Stefan Steiger Oct 26 '17 at 08:57
  • Using VS2017, I no longer have a Compare option when right clicking a folder. This only seems to be available on files. – MyNameIsKo Dec 05 '17 at 20:32
  • @MyNameIsKo: https://learn.microsoft.com/en-us/vsts/tfvc/reconcile-differences-between-two-folders – mhu Dec 06 '17 at 00:50
  • @CincinnatiProgrammer I had same issue, but you can filter solution changes in Team explorer. 1. exclude everything. 2 in Exclude Changes tab change view options to "show solutions changes". Hopte that helps – Eduard Jacko Mar 27 '18 at 10:44
  • "Compare" still didn't detect that I had deleted one of my local folders. It just noticed that the folder and its contents were checked out for editing. The "Reconcile" button along with most of the other buttons were grayed out. – Kyle Delaney Jul 05 '18 at 14:41
  • VS-2019 Does not seem to have reconcile... PowerTools appear to be gone in the new world of Azure DevOps.... – David V. Corbin Feb 04 '21 at 15:38
48

If you have a network connection to your server while you're working outside of Visual Studio, it's probably best to go ahead and check the file out before editing it, either using the tf command line client, or using the Windows Explorer shell integration that's available in the TFS Power Tools release. (Plus an increasing number of other tools have TFS integration that makes this automatic, but if you're just using notepad, this still needs to be a manual step.)

Of course, there are many times when you're working and you don't have a network connection available that allows you to check out the files.

If you know what files you've modified, you can just check them out from within Visual Studio, then you'll be able to check them back in.

If you don't know what files you've edited, you can detect the changes by running the tfpt online command (also part of the Power Tools release). This will locate the files that have been modified locally and check these files out from the server.

Asbjørn Ulsberg
  • 8,721
  • 3
  • 45
  • 61
Edward Thomson
  • 74,857
  • 14
  • 158
  • 187
  • Visual Studio doesn't seem to detect changes to files just by checking them out. I just tried checking out a folder and the contents showed up in pending changes as edits. Then I deleted the folder in File Explorer and refreshed the pending changes but Visual Studio didn't say the files were deleted in pending changes. Also, the files were still present in Solution Explorer. – Kyle Delaney Jul 05 '18 at 14:20
35

This worked for me, using the TFS Power Tools:

tfpt online /adds /deletes /diff /noprompt /recursive directory-name

(where directory-name is the path to the directory to be updated, otherwise it will detect changes throughout your entire TFS repository)

If you want to know what it would do without it actually making any changes, you can force it to do a dry run by adding the /preview switch.

Adam Batkin
  • 51,711
  • 9
  • 123
  • 115
16
*1- make changes outside of Visual Studio
2- go to Visual Studio and open Source Control Explorer
3- right click on the folder > "Check Out for Edit" > "Check Out"
4- right click on the same folder > "Undo Pending Changes..." > "Undo changes" > "No to All"*

I tested this workaround on a branch and it helped me a lot. But there are only new files and new folder who has to be done manually.

I recommend to create a branch before the operation. It isolates you the time of the operation.

Note: This technique does also the files identical cleanup that TFS always marks as modified.

hugbe8
  • 177
  • 1
  • 5
  • 3
    This should really be a comment on **alga**'s post, not a new answer. In any case, I'd still recommend against doing this for the same reason I recommended against it when alga suggested it above. – Edward Thomson Jan 27 '12 at 18:53
  • Utterly brilliant ! Exactly what I was looking for (after our company moved our TFS server, and TFS/VS2010 were baffled by it). Now, I just have my edited files checked out. Thanks! – Mike Gledhill Jan 03 '14 at 10:01
  • This works, but MS should provide better ways to do this. Command line and hacks should not be necessary on a good product (especially if this is embedded into VS). SVN and Mercurial do this for fun... – user2173353 Jan 08 '15 at 11:30
  • Instead of point 4, you could use tfpt uu https://stackoverflow.com/a/544285/10245 – Tim Abell Oct 06 '17 at 14:28
  • This just undoes what you did. It doesn't make Visual Studio aware of what you did. – Kyle Delaney Jul 05 '18 at 14:47
  • This seems worth noting, when I did this, TFS showed all new changes in existing files but did not pick up any newly created files. – Richard Jul 26 '18 at 18:30
7

Try this. It's some sort of workaround, but it works:

  1. make changes outside of Visual Studio
  2. go to Visual Studio and open Source Control Explorer
  3. right click on the folder > "Check Out for Edit" > "Check Out"
  4. right click on the same folder > "Undo Pending Changes..." > "Undo changes" > "No to All"

That's it. The changes are visible now.

Oleksandr G
  • 2,060
  • 3
  • 22
  • 31
  • 3
    I'd really recommend against this - my biggest worry would be that I'd fat-fingering this one and accidentally undoing all my legitimate changes. In addition, you're checking out all the files which, depending on your client and server configuration, will probably take a lock on some or possible all files and could do a get latest on check out which could certainly be annoying. – Edward Thomson May 05 '11 at 15:10
  • 1
    This just undoes what you did. It doesn't make Visual Studio aware of what you did. – Kyle Delaney Jul 05 '18 at 14:47
  • And if you created or added new items, in that session: Gone baby, gone! – Christian Apr 08 '19 at 11:23
4

There's also another solution to get TFS to figure out the files that have changed outside of Visual Studio:

  1. Open the solution offline
  2. In Solution Explorer select the solution file and then press the Go Online button (GoOnline Button Icon)

TFS will automatically scan the solution for changes after this.

Step one can be achieved in a number of different ways. Here are some:

  • Use the GoOffline Extension - very simple and effective.
  • If you're asked for TFS credentials when opening the solution (no automatic domain auth), then don't enter the credentials. The solution will open offline and you'll login after pressing the Go Online button
  • (extreme solution) Disconnect your network cable; Open the solution; Connect the network cable.
Cristian Lupascu
  • 39,078
  • 16
  • 100
  • 137
  • Worked for me, I made changes while TFS was down, and after it came back I had to press Go Online on the solution file to force-recognize the changes. Thanks – Péter May 15 '23 at 16:56
2

Visual Sourcesafe works like this too and the way I get VSS or TFS to notice the change is by checking the file out once inside Visual Studio.

CheckRaise
  • 550
  • 2
  • 16
1

Open Source Control and go to your TFS folder. Right-click on the folder and choose 'Compare'.

Notice that your edited files show up marked in red.

I find this is better than tfpt online which also gets you files that are not readonly and not edited.

g t
  • 7,287
  • 7
  • 50
  • 85
1

I had this problem in the past, when my Internet was down and I worked offline, and most of my changes didn't appears in Team Explorer.

Following these steps: First, In the solution explorer, select the folder that you want to re-conciliate (for me, it was my entire solution folder), and select Compare... enter image description here Click in Modify Filter, and in the filter text-box, you could type:

*.cs;!obj\;!bin\;!packages\;

In this example, it will include in the search only C# files and exclude in the folders: bin, obj and packages.

Notice the column Pending Change has the info whether the file is marked as edit, add, etc... or nothing...

  • To mark as edit (when the local item has a matching server item), select the file and choose Check out for Edit...
  • To mark as add (when the local item doesn't have any server item), select the file and choose Add Files

Finally, I am not sure why the projects are not listed here (after I remove *.cs filter, still doesn't show up), so rebuild the solution to make sure the projects updates as well

+ In the solution, click the connect button (if shows up) that said Go Online.

Jaider
  • 14,268
  • 5
  • 75
  • 82
0

I found that in Visual Studio 2015, with the project open, Visual Studio discovered for itself that files had been modified externally, and automatically checked them out without me having to do anything. Checking in the project in the normal way saved the external modifications.

Graham Laight
  • 4,700
  • 3
  • 29
  • 28
0

In my case, the following worked (at least the one time I tried it):

  1. Go to the Pending Changes panel
  2. Select View Options under either Included or Excluded changes.
  3. Switch between Show All and Show Solution Changes
  4. Switch back if desired

Refresh TFS Changes

Changing the View Option appears to force a refresh of modified files.

snumpy
  • 2,808
  • 6
  • 24
  • 39