TFS: merge changes from one file back to the latest version

Question

Consider the following problem. You delete the code from the file in change set 10. Later, you realize that the code should not be deleted, and you want to merge it back into its latest version.

How do you do this with TFS with Visual Studio?

Using (Win) CVS, which is as simple as selecting a file, and using the merge options of the update command to merge the changes from the old version back to your latest version. In TFS, I cannot figure out how to do this.

Using the Get a specific version option seems to replace my recent changes, preventing me from merging.

Currently, the only possibility I seem to be to get the old file from the changeset manually and merge the changes using the comparison tool in the latest version.

Answer 1

tfpt rollback file.cs /changeset:10

See tfpt rollback /? for additional options.

You can do the same with a series of built-in commands - tfpt only calls the public APIs, but if you are not very happy with the 3-way merge / conflict / resolution terminology used by TFS, this is a much less error if you allow the tool to process her.

, . ( , ). , TFS 2010, , , .

Answer 2

, .

spesific , .

elses, , , .

, , .