It's all about the answers!

Ask a question

How do I deliver in two baselines?

Amit Nath (069) | asked Dec 22 '15, 4:24 a.m.
 The scenario is...

Enhancement_stream & Maintenance_stream are looking at baseline #10 & baseline #15 of same component respectively. Now when Maintenance_stream had bug fix in baseline#10 & wanted to deliver the same fix in baseline#15. How do they do it without accepting the incoming(ie #15 baseline) in their repo workspace? 

Maintenance_stream team works on purely bug fixing & Enhancement_Stream team works on new development

One answer

permanent link
Geoffrey Clemm (30.1k33035) | answered Dec 22 '15, 11:51 p.m.
The wording of the scenario has some problems, but I'll assume "deliver the same fix in baseline #15" means "deliver the same fix to the enhancement stream".

In order to perform a bug fix, you had to create a change set that contains the changes for that bug fix.
In order to deliver that bug fix (but not all the other changes in the Maintenance_stream)  to the Enhancement_stream, you would select (or create) a workspace that is caught up with the Enhancement_stream, and Accept that change set into the workspace.   If this creates a merge conflict, the RTC Pending Changes view will guide you through performing that merge.   Once there are no conflicts, you can then deliver the changes in that workspace to the Enhancement_stream.

Your answer

Register or to post your answer.