After rebasing parent view to child view successful, why promoting to the parent from the child shows unresolved situations?

0 Likes

Problem:

After rebasing parent view to child view successful, why promoting to the parent from the child shows unresolved situations?

Resolution:

  • Product Name: StarTeam
  • Product Version: 2008
  • Product Component: VCM
  • Platform/OS Version: Windows

Description:
After rebasing parent view to child view successful, why promoting to the parent from the child shows unresolved situations?


Answer/Solution:
There are few cases where promote will result in unresolved situation after you have resolved everything in rebase.

Case 1.

1) Assume that you have modified a file in both target and source.

2) You rebase from parent to child.

3) You will get "Modified in source, modified in target". This is clearly expected.

4) You right click and select "Merge File Content"

5) You took the default suggestion which is the target file will have the content prior to the modification. That will allow you to resolve and commit.

6) Now go ahead and do Promote. You will still see same unresolved situation because the file content are not the same. Remember what you have done in step 5 will determine the result here.

Case 2.

1) Do step 1 through 4 above.

2) In the right pane, put the mouse over the highlighted line and click on the two left arrows. That will override the default merged result. Save and exit from the File compare/Merge tool.

3) Do step 6 above and you will end up with the same result as step 6 in case 1.

Case 3.

1) Do Step 1 through 4 from Case 1 above

2) In the left pane, put the mouse over the highlighted line and click on the two right arrows. That will override the default merged result. Save and exit from the File compare/Merge tool.

3) Do the Promote - this time, you should not get unresolved situation because the file contents of the source and the target are the same.

Case 4.

1) Do Step 1 through 3 from Case 1 above.

2) Right click and select overwrite.

3) This will allow you to resolve and commit.

4) Do the Promote - this time, you should not get unresolved situation because the file contents of the source and the target are the same.

Case 5.

1) Do Step 1 through 3 from Case 1 above.

2) Right click and select Ignore

3) This will allow you to resolve and commit.

4) Now go ahead and do Promote. You will get unresolved situation because the file content are not the same.

Therefore, based on the above 5 cases, you will get unresolved situation in 1, 2, and 5 depending on the action taken during Rebase.




Author: Eyob Kidanmariam

Old KB# 28945
Comment List
Related
Recommended