CODEWITHSUNDEEP
.nettfsmergetfs-2005
Bilgin Kılıç
Bilgin Kılıç

Reputation: 9139

how to merge two changesets only (TFS)

alt text

You see 162489 and 162990, How can I merge them ?

Upvotes: 15

Views: 39215

Answers (4)

Martin Hyldahl
Martin Hyldahl

Reputation: 1658

I'm guessing that you want to merge only those two specific changesets into another branch.

You cannot merge multiple changesets in one go, unless the changesets are in sequence.

Using the tf command line tool you specify a range of versions by separating the version with a tilde character.

tf merge /recursive /version:C162489~C162990 "$/SourceBranch" "$/TargetBranch"

In this case the changes 162987 and 162967 will also be included.

If you are using the UI in Visual Studio then the merge dialog will prevent you to select multiple individual changesets unless they are in sequence.

To merge two separate changesets into another branch you will have to do it in two steps:
merge 162489 and then 162990 (start with merging the oldest changeset in case both changesets contain changes to the same files).

Then your workspace for the target branch will contain the changes for both changesets and now you can check-in the merges as one changeset in the target branch.

Upvotes: 28

Noushad Poovakkattil
Noushad Poovakkattil

Reputation: 171

Try this

tf merge /recursive /version:C162489~C162489 "$/SourceBranch" "$/TargetBranch"
tf merge /recursive /version:C162990~C162990 "$/SourceBranch" "$/TargetBranch"

If you don't have a conflict code change in these changeset TFS 2010 will merge consecutive merges.

Upvotes: 7

Captain Comic
Captain Comic

Reputation: 16216

Merge must be done in successive manner. In your case merging two changesets that are not successive is not safe because you can loose changes that could be done to the same files. That is why TFS client does not allow you to do that.

Upvotes: 2

Ewald Hofman
Ewald Hofman

Reputation: 12668

In the TFS Merge help - http://msdn.microsoft.com/en-us/library/bd6dxhfy(v=VS.100).aspx -, you see in the 2nd example how you can merge one changeset:

tf merge /version:C137~C137 branch1 branch2 /recursive

Is that what you are after?

Upvotes: 9

Related Questions