Question

Somehow, due to folder renamings and various other source code changes, I’m having an irritating problem. I’m showing a pending change for a file that cannot be undone in TFS.

This is a little hard to completely explain. Here is what the directory/file structure looks like in TFS:

RootFolder
    Folder
        FileA
        FileB
    OldFolderThatWasRenamedToFolder (shows add icon)
        FileA (shows "edit" pending change)

“OldFolderThatWasRenamedToFolder” had been renamed to “Folder” and is committed to TFS like that. The “FileA” under that non-existing folder references the same file as “Folder/FileA” but registers as a different file; for example, if I change “Folder/FileA,” pending changes are shown for both “files.” Whenever I undo pending changes for the phantom file, TFS reports the error:

No pending changes were found for …/Folder/FileA.

I cannot get rid of this annoying false pending change. I’ve done an update in the folder forcing an overwrite and even deleted the folder prior to the update. How can I eliminate this phantom pending change?

Update:

I found a potential clue. When I compare the “pending” file with the latest, no changes are detected, but when comparing with the “Workspace version,” the file is compared with an older version of the file. I’ve recently tried deleting my workspace and creating a new one, but the same problem persists. What exactly is going on? Where are these pending changes even stored? Is there some file I can manually edit?

Answer 1

I figured out a way to fix this using the tf.exe command line. By entering this:

tf undo /workspace:MyWorkspace $/.../RootFolder/OldFolderThatWasRenamedToFolder/FileA

…I was able to undo the pending change. If anyone knows how to do this same thing without resorting to the command line, I’ll accept their answer instead.