We're performing a delivery from our Developer stream to the Integrated stream that we share - this process allows our build team to construct our application from the Integrated view. This is for a Java application.
There are several activities that were never delivered to the Integrated stream - old changes that were never desired by the users.
We're planning to do a deployment, and it is becoming increasingly difficult to discern which activities should and should not be deployed (we are already taking steps to improve our Activity Naming convention). So we're planning to deploy all checked-in activities, on the assumption that our current environment in DEV is an acceptable deployment for our TEST team.
I have a few questions regarding how ClearCase would handle such a delivery.
- How does ClearCase handle two activities that are being delivered at the same time that have both made changes to the same Class object?
- How would ClearCase handle an old activity being delivered with class chages where a newer activity has already made changes to that class and rendered it obsolete?
- What differences between two versions of the same class would trigger a "Merge Difference"?