Merge Issue Question

Question

Hi all.  I have a question for anyone.  I noticed in TFS 2010 that a dev has merged files from one branch to another.  After the merge, I can see in history the changeset details, etc...  However, when I select the branch to merge in the same direction, I am picking up the very same files from the previous merge as a new pending change yet those files have not changed.  How is this possible?

I have latest on both branches.  There were no changes after the initial merge in either branch for any of those files yet somehow, the merge is picking up new changes?

---

-7

Answer 1

Hi smyrin,

Thank you for your post.

According to your description, i understand your situation is you have Branch-2 branched form Branch-1, you do some changes to Branch-2, then merge back to Branch-1. But the result is you cannot see the changes in Branch-1. If I have misunderstood anything, please free feel to let me know.

Would you please do following steps, and provide corresponding information to help narrow down the issue.
1. Please remember check in pending changes in Branch-2. Else, merge back you will still cannot see the new changes.
2. Please check the source branch and target branch when you do merge, make sure you have the right merge direction.
3. Please select Latest Version in merge operation Select the versions of the source items step.
4. Actually, if you do not delete the items from version control, you will not lose the new changes, Branch-2 is still there, you can check if the curent Branch-2 is the one you want, and re-do the merge operation.

If the issue still exists, would you please provide the detail setps you do, it will help reproduce the issue.

I hope this information will help resolve this issue.

If anything is unclear, please free feel to let me know.

Regards,

---

Lily Wu [MSFT]
MSDN Community Support | Feedback to us

Answer 2

No that was not the issue.  I think I figured out the cause though.

Dev 1 makes some changes to file 1 in branch 1 and does full branch reverse integration to branch 2.

Dev 2 gets latest and attempts a full reverse integration from branch 1 to branch 2 afterward and finds the same file flagged for merge.

This should not be possible given that dev 1 already merged the file.

The cause, I think, is that dev 1 did not get latest before the merge.  Dev 1 made changes to file 1 and later dev 2 made changes to same file.  Dev 1 does RI without getting latest so that when dev 2 does merge, they see that a merge is still required since they have latest.

---

-7

Answer 3

Hi smyrin,

Thank you for your response.

Do branch 2 branched from branch 1? Can you provide more information of the branches structure?

How do you do full branch reverse integration from branch 1 to branch 2, would yo please post the detail steps, they will help reproduce the issue?

Regards,

---

Lily Wu [MSFT]
MSDN Community Support | Feedback to us

Answer 4

My initial hypothesis was wrong as I was unable to reproduce.  I did some more digging.  Here is the changset timeline.

140779 (20120910-0912) 142696 (20120917-1000) 142707 (20120917-1016)

139831 (20120905-1437) 140772 (20120910-0857) 143123 (20120918-0926)

---

-7

Answer 5

So it looks like only the "change" is merged.  When the code is merged to v7.2.0 RC (142696) it is coupled with 140772 but gets uncoupled when going to Main; hence the need for two merges.

Is this right?

---

-7

Answer 6

Hi smyrin,

As far as i know, merge are merge changes. You need two times merge that main will keep all the changes.

Answer 7

Hi smyrin,

How about the issue now?  I suggest you mark useful post as answer, it will be very beneficial for other community members having the similar questions.

If anything is unclear, please free feel to let me know.

Best Regards,

---

Lily Wu [MSFT]
MSDN Community Support | Feedback to us