In TFS, how do I do a baseless merge on specific changesets?

Question

As with most things in TFS you get more than you bargained for. In this case I am seeing more file changes during the merge than I was expecting.

I have 2 child bran

Answer 1

If you need to merge a specific changeset you need to use the following statement:

tf merge /baseless /recursive /version:C95654~C95654 branch2 branch1

(It means ONLY changeset C95654).

The commandline you are using means every changeset before and with C95654.

Answer 2

I had to use tfs paths for the two branches. Steps were: add both branches to the desired workspace; get latest; open a Windows powershell in the target folder. Get tfs paths

>tf workspaces /format:detailed 
>tf workfold

Then use $paths for the branches. Same changeset number between the tilde ment baseless merge for one changeset.

>tf merge /baseless /recursive /version:C999~C999 "$/MyRepo/Current" "$/MyRepo/Development"

More here -- http://blogs.msdn.com/b/bharry/archive/2011/08/31/merge-enhancements-in-tfs-11.aspx