Merging: How is the target branch determined (or: how to merge)
Hi,
I am trying to merge a changeset into another branch. I'd like to know how Team Foundation Source Control determines what target branches are possible to choose.
Let me explain by examplifying. My branch setup is this
The root is branched into 2 separate branches, A and B
A is later branched once more, so we have A and A.a.
Now, I'd like to merge a changeset from the branch A.a directly into B without merging the change into branch A. Is this possible? The target branches I get when I choose the A.a source tree is only A, not B.
[560 byte] By [
ThomasL] at [2008-2-4]
Maybe a late reaction to this post, I did not realize this limitation until today.
This is a TFS/SC limitation that is hard to accept and definitely a merge function that you expect to find in an advanced version contol tool.
If the merge tool traverses the version tree of each file it would find the common anchestor and then a three-way merge could take place.
Will this function be available in a future version (from the GUI)?
For the simple case this is true but I am going to write a blog post that shows how this fails for a lot of the complex scenarios and why we decided not to do it. Now that does not mean that we cannot go and try to create logic only for the simple scenario but when doing that the benefit cost analysis it was really hard to justify.
Blog: http://blogs.msdn.com/mrod/default.aspx
Thanks, mario
