Safely delete a TFS branch project

问题:

I'm currently reorganising our TFS source control for a very large set of solutions, and I've done this successfully so far.

I have a problem at the moment where I need to delete a legacy "Release Branch" TFS project that was branched for the old structure, and is no-longer required since I now host a release branch within the new structure.

This is an example of how the source control now looks after moving everything:

$/Source Project
    /Trunk
        /[Projects]
    /Release
        /[Projects]

$/Release Branch Project
    /[Projects]
    /[Other legacy stuff]

So far I've found information that says:

1. tf delete /lock:checkout /recursive TestMain to delete a branch.
2. TfsDeleteProject to delete a project

tf delete seems to be only relevant when I need to delete a branch that is within the same project as the trunk, and TfsDeleteProject doesn't seem like it will delete the branch association from the source project (I hope I'm wrong, see below).

Can someone tell me if the above will work, and in what order I should perform them in, to successfully delete the TFS $/Release Branch Project while also deleting the branch association (from right-click $/Source Project -> Properties -> Branches)?

回答1:

In TFS you generally cannot permanently delete anything inside a team project (and TfsDeleteProject deletes a complete team project, but it is not clear if the source control content will actually be removed as a team project is just the top level of the source control tree).

A delete of a file, or whole set of files is just another tracked change, go back into history and it can still be seen.

You could use permissions to make it inaccessible to all. Or rename under an "Obsolete" team project.

EDIT (I finally remembered where this command was):

There is another option, from the command line: tf destroy:

Destroys, or permanently deletes, version-controlled files from Team Foundation version control.

I would expect this to remove the branch records to create the, now destroyed, files... but you might need to check.

回答2:

Let me put the facts like this:

• Within the context of the TFS source control system, "Delete" is a purely logical operation. You can Undelete at any time. You can have multiple deleted items occupy the same path over time, or even simultaneously. Branch relationships are preserved.
• TFS "Destroy" is physical removal. To maintain database integrity, that means all entity relationships are removed too: changeset history, pending change records, shelved versions, merge history, and yes -- branch hierarchy. This Destroy feature was introduced in TFS 2008.
• Destroy is the only operation allowed to alter the merge history table (from which branch relationships are determined). All other operations are strictly append-only.
• TfsDeleteProject does its best to completely remove all traces of a project, the primary goal being to allow creation of a brand new project with the same name. Some TFS subsystems support physical deletes; some, such as WIT field metadata, only support logical deletes, even in TFS 2008 & beyond. In the case of source control, TfsDeleteProject invokes "delete" in 2005 and "destroy" in 2008+.

回答3:

Select the branch folder you want to unbranch. then File > Source Control > Branching and Merging > Convert to Folder.

回答4:

In VS2013 I couldn't find it under @Radhika answer

I did find it under Team Explorer > Source Control Explorer >right mouse on project > Branching and Merging > Convert to folder

Hope this saves you time.

Edit Copied from comment by @DdW: you need to do a Get Latest Version after converting, before the Delete option will be enabled