Reputation: 31
We've been moving from Base CC to UCM but it couldn't be done all at once. We did a clearfsimport from Base to UCM then created a Prod project based on a post-import baseline.
We've since created other Projects using the most recent baseline (Prod_1) from Prod. Recently, we had to bring in another 'Project' from Base to UCM. The newly imported project's baseline was delivered into the Integration stream of Prod.
This gives us something this:
Prod [Project]
In order to pick up the changes from BL Prod_2 in Release_2, we did an Advanced Rebase on Release_2_Integration and picked BL Prod_2. It completed and said we had no versions that required merging.
However, it looks like the existing Integration Stream was entirely 'overwritten' by BL Prod_2 and lost all of the changes currently in Release_2_Integration.
If you look at the version tree of the 'missing' elements, you can see that they are part of the baseline created in Release_2_Integration after the rebase, even those they are not in a freshly updated Release_2_Integration view.
Does anyone have any suggestions on the proper way to do this? I have a pre-deliver BL on Release_2 so I can easily create a new project based on that.
Would we be better off creating a single 'Application' project using (sub)streams for each release/work-effort?
Thanks!
Upvotes: 1
Views: 179
Reputation: 1324537
We did a clearfsimport from Base to UCM
You don't always has to: you can create components in any vob (linked to an admin pvob)
we did an Advanced Rebase on Release_2_Integration and picked BL Prod_2.
(Advanced rebase means CCRC, right?)
If that rebase isn't working as you want, the easiest way to troubleshoot and move forward is to create another project, that you rebase directly with the right baseline.
Upvotes: 0