CODEWITHSUNDEEP
version-controlrtc
blue-sky
blue-sky

Reputation: 53826

Merging two streams in RTC source control

I have two streams : sA & sB

sB was created from sA as change sets in sB were not to be included in sA. Two paralled streams of development have been ongoing : sA and sB

Development has now completed on sA. sB contains changesets which are not in sA.

sA and sB are to be merged so that change sets in sA are to be included in sB but change sets in sB are not to be included in sA.

This is how I think the merge should occur :

  1. Each developer who has been working on sA change their flow target to sB .
  2. Each developer deliver their change sets to sB.

sB now remains independent and contains change sets which are not in sB but also contains all of the change sets where are in sA

Is this a valid approach ?

Can I deliver change sets to the stream which have been created by another developer, if so this means each developer does not have to deliver their streams as I can do it for them ?

Upvotes: 1

Views: 1784

Answers (1)

VonC
VonC

Reputation: 1325137

It is technically "valid", but I really prefer the "pull" approach:

  • One integrator creates a repo workspace on sB.
  • The flow target is changed to sA, in order to accept change sets from sA.
  • The flow target is restored to sB.
  • He/she merges in his/her local workspace, checkin, put a baseline, and deliver to sB.

That allows devs for sA to only have to worry about delivering to sA, not carring about sB.

Upvotes: 3

Related Questions