We have a changeset where the developer has checked in changes to both source and target branch, many changes including renames in both branches. The merge of the the changeset from source to target branch goes fine, but the changeset remains in the list of changesets to be merged.
When I now try to merge the changeset again, it says "There are noe changes to merge.". And the changeset remains in the queue.
We have tried to use the command line tool to discard the changeset like this:
C:\src\project\sourceBranch>tf merge /discard /recursive /version:C8137~C8137 $/Project/sourceBranch $/ Project/targetBranch
This did not help. We have also tried using other options like /force and /baseless with no luck.
See problem as first published on stackoverflow: http://stackoverflow.com/questions/10349483/tfs-merge-cannot-discard-a-changeset