How do I Merge Baseline 1 changes to Baseline 2? Both use same stream
here is the scoop. We have a baseline
Baseline BL 1 (Created 2015) -> Stream R
and Baseline BL 2 (Created in 2020) -> Stream R
Some of our developers have been delivering all changes in BL1, so dev in BL2 can't see them. Is there a way to merge BL1 into BL2 so that BL2 has all the BL1 changes?
|
One answer
Geoffrey Clemm (30.1k●3●30●35)
| answered Nov 16 '20, 5:29 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER edited Nov 16 '20, 5:41 p.m. When you say "User 2 modifies Stream R", I assume you mean "User 2 delivers the changes in their workspace to Stream R". And when you say "sets it to use these components", you mean "causing R to select the BL2 baselines of comp1, comp2, and comp3".
When you say "User1 delivers changes to stream", I assume you mean User1 made changes in the User 1 workspace, and delivers those changes to stream R"?
When you say "User 2 doesn't see changes user 1 delivered", are you saying that User 2 looks at their Pending Changes view, and doesn't see incoming the changes from Stream R to the User 1 workspace? If so, this would certainly happen if somehow the flow target of the User2 workspace no longer points to Stream R (so they don't see those incoming changes from Stream R) or if the flow target of the User1 workspace wasn't pointing to Stream R (so the User 1 changes never made it to Stream R).
But it is easy to find out which workspaces and which streams actually have the change set .. either by looking at the change set history of those workspaces and streams, by doing "compares" of those workspaces and streams, or by using the "Locate change set" function.
|
Your answer
Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.
Comments
What is "Baseline BL 1 (Created 2015) -> Stream R" intended to mean?
Here are some more details, in a linear time line manner I hope explains what I'm seeing. maybe will help with where we have gone astray.
Day1: Stream R was created and populated with components and Baseline 1 was created
comp 1 (BL1)
comp 2 (BL1)
comp 3 (BL1)
User 1 and User 2 Devs create workspaces
User 1 Workspace looks like
comp 1 (BL1)
comp 2 (BL1)
comp 3 (BL1)
User 2 Workspace looks like
comp 1 (BL1)
comp 2 (BL1)
comp 3 (BL1)
Time passes......
User 2 modifies Stream R and sets it to use these components
comp 2 (BL2)
comp 3 (BL2)
User 1 Workspace didn't change and still looks like
comp 1 (BL1)
comp 2 (BL1)
comp 3 (BL1)
comp 2 (BL2)
comp 3 (BL2)
User 1 delivers changes to stream
User 2 delivers changes to stream, doesn't see changes user 1 delivered.