The reference on “composite Baselines” is: “Best practices for using composite baselines in UCM“. Introduced in ClearCase v2002, composite baselines are a mechanism for grouping baselines into a collection. One baseline is designated as the composite, and other baselines become members of the composite You do not necessarily have to use composite baselines when you … Read more
Actually, when I look at the version tree, the source of the conflict during the rebase is clear: When you re-read the way ClearCase 3-way merge works, you see it needs to go back in the version tree in order to find a common ancestor to: the source (Int/2) the destination (B/1) That common ancestor … Read more
This is correct, but first a few reminders: having a sub-stream does not mean a deliver have to be done from that sub-stream to its parent. A deliver can be done from a stream to any other one. sideway merges can be dangerous if the two streams are not based upon the same foundation baseline … Read more
If you don’t want to merge a specific type of file, you can change its type to a “copy merge” policy (ClearCase will copy the source over the destination) cleartool find . -name ‘*.jar’ -exec ‘cleartool chtype “COPY_MERGE” $CLEARCASE_XPN’ This is an improvement from the NEVER_MERGE presented in this IBM article, and is available in … Read more
If you are in a view, you can: get the current stream cleartool lsstream -cview get all baselines for a component in that stream cleartool lsbl -comp myComp@\myPVob -stream myStream@\myPVob get all foundation baselines for that stream cleartool descr -fmt “%[found_bls]CXp” stream:myStream@\myPVob Don’t forget that in a view on a stream with a modifiable component, … Read more
It will contain all changes. Except an incremental baselines will compute those changes by adding: unique modifications introduced by the few changes (that is what an “incremental baseline” is: a label set only on the new versions since the previous baseline) all the other changes already references by the previous baselines up to a full … Read more