StarTeam merge changes

2
votes

I'm new at working with StarTeam, having previously used Subversion in projects. In order to find out how the change packages work, I've experimented a bit - and not quite gotten the results I would've liked.

I have tried to following steps: (I have 2 views, one called 'trunk' and one called branch1.1 which is a child of trunk)

  1. trunk: Creating file TestMerge.txt with the content 'A'
  2. trunk: TestMerge.Txt -> adding a new line with content 'B'

  3. trunk: TestMerge.Txt -> adding a new line with content 'C' I go to 'Show Change Perspective' and find my 3 check-ins.

    • I select 1 and 3, right-click, advanced, View Compare/Merge.
    • I select rebase with trunk as source and branch1.1 as target.
    • Under include I select 'Selected change packages'.
    • I dont change options or properties.
    • Finish now brings up a window called 'Rebase from trunk'
    • The TestMerge.txt has merge status: Resolved, Merge Action: ignore.
    • I can only change this to 'share' (and I cannot commit if it is ignored, since nothing is changed).

When I commit these changes, branch1.1 now contains a file called TestMerge.txt - however that file contains A B and C.

I would only expect it to contain A+C, since I didn't ask for my second commit to be included in the change package.

Is that just the way StarTeam (doesn't) work or is there somewhere I can get what I want?

1
starteam

1 Answers

0
votes

StarTeam does not support merging two versions of the same file in the same view,
especially not via the "Change-Packets" process, or the "View Compare/Merge" tool.

"Change-Packets" process and the "View Compare/Merge" tool are designed
for merging files and folders from different views.

(Try this with two versions of the same files that are sitting in different views.)