Parallel Development Across both CM systems
Developers in AccuRev and ClearCase will be working on the same source tree (common source). From within either system, the process will resemble a standard parallel development model utilizing separate branches/streams for each "group."
Branch/Stream Pair 1(For synching ClearCase changes to AccuRev) |
Branch/Stream Pair 2(For synching AccuRev changes to ClearCase) |
|||
 |
 |
|||
| ClearCase Writeable branch The development in ClearCase will take place here. Changes in this branch will be synchronized into the AccuRev read-only stream. |
AccuRev Read-only stream This is where the changes from the ClearCase Writeable branch are synchronized. |
ClearCase Read-only branch This is where the changes from the AccuRev Writeable stream are synchronized |
AccuRev Writeable stream This is the stream where the development in AccuRev will take place. Changes promoted into this stream will be synchronized into the ClearCase read-only branch. |
|
Development in ClearCase
ClearCase developers will proceed to develop in ClearCase as normal and are completely abstracted from the adapter. As changes are checked into the ClearCase writeable branch, they will be available for synchronization to the AccuRev read-only stream.Development In AccuRev
AccuRev developers will proceed to develop in AccuRev as normal and are completely abstracted from the adapter. Changes promoted to the AccuRev writeable stream will be available for synchronization to the ClearCase read-only branch.Synchronization
The synchronization engine scans for new changes in the AccuRev writeable stream and synchronizes them to the ClearCase read-only (import) branch. Similarly, the synchronization engine scans for new changes in the ClearCase writeable branch and synchronizes them to the AccuRev read-only (import) stream.Contents changes, Namespaces changes (moving/renaming, removing, creating new elements, etc…), and Merge history are fully supported and bi-directionally synchronized between AccuRev and ClearCase.
Integration/Merge from AccuRev Read-Only Stream (synched from ClearCase) to AccuRev Writeable Stream:
In order to integrate changes made by ClearCase developers into the main AccuRev development stream, AccuRev is used to cross-promote/merge changes from the AccuRev read-only (import) stream to the AccuRev writeable stream.NOTE: AccuRev for ClearCase automatically tracks these "integration versions" that are promoted to the AccuRev writeable stream to differentiate them from regular development versions (Merge History Tracking).
Integration/Merge from ClearCase Read-Only Branch (synched from AccuRev) to ClearCase Writeable Branch:
Similarly, in order to integrate changes made by AccuRev developers into the main ClearCase development branch, ClearCase’s Merge Manager or Find merge tool is used to merge changes from the ClearCase Read-Only (import) branch to the ClearCase writeable branch.NOTE: AccuRev for ClearCase automatically tracks these "integration versions" that are merged to the ClearCase writeable branch to differentiate them from regular development versions (Merge History Tracking).