ClearCase : Making new baseline with old baseline activities

by

No: Since B1 exists, all activities are “linked” by a common “timeline”, and ClearCase will ask you to also include A2.

A possible solution would be to create a sub-stream, and to make a findmerge with only A1 and A3
(a findmerge is a non-UCM merge that can still take a list of UCM activities as an input)

The fundation baseline of the sub-stream should be the last baseline (produced on IntStream) not including A1, A2 and A3.

Then:

ct findmerge activity:A1@\pvob activity:A3@\pvob -fcsets -c "report for delivery" -merge -gmerge

That sub-stream plays the role of a “release stream”, or “consolidation stream”, that is a stream which will include all you need to build a final release.

The parent stream (IntStream) goes on in its role of integrating all development effort (coming from other sub-streams)

Note:

  • “pvob” is meant to be replace by the name of your project vob (the vob containing all UCM datas like projects, streams, baseline, activities, …)
  • “ct” stands for “cleartool”: it is an alias (Unix) or a doskey (Windows version of an alias: doskey ct=cleartool $*)

Activity dependency: A3 could in this case have some versions based on A2 versions.

findmerge command only uses activities for their changeset (list of versions) to be merged:

Each version listed in a change set becomes the from-version in a merge operation. As always, the to-version is the one in your view.

A3 including changes made in A2, the final result will include A1, A2 and A3 changes, except if A1 and A3 changes are “concurrent” (changes on similar lines): in this case, a non-trivial merge will need to be performed.

Since you do not want A2 changes, you need, as you mention in the comments, to complete that findmerge operation with a perl utility script cset.pl:

ccperl cset.pl -undo A2

It will perform a “negative merge” (or “substractive merge”), removing any changes for A2.

More Related Contents:

  1. What are the basic clearcase concepts every developer should know? [closed]
  2. What are the differences between a snapshot view and a dynamic view?
  3. What is the difference between Full baseline and Incremental baseline in Clearcase UCM?
  4. In ClearCase, how can I view old version of a file in a static view, from the command line?
  5. Evil twin problem and subtractive merge
  6. why I only get a clearcase version 0?
  7. Creating a new subdirectory structure in ClearCase?
  8. ClearCase UCM – best practices using components
  9. Integration stream vs integration view in ClearCase
  10. ClearCase: Can I hijack a file in dynamic view?
  11. How do I roll back a file checked in to Clearcase?
  12. How to obtain UCM stream and baseline with cleartool?
  13. List the latest baseline of a component in a UCM stream one by one
  14. How do I create a snapshot view of some project or stream in ClearCase?
  15. Clearcase UCM is trying to merge pdf files
  16. Recursive checkin using Clearcase
  17. ClearCase : Loading Older Version of a specific Directory?
  18. Clearcase Issue [closed]
  19. how to find out all the activities happend in a branch in the last month?
  20. how to find files in a given branch
  21. How to search files by label
  22. ClearCase wants to merge unchanged files after deliver to alternate target
  23. Find files in Clearcase view newer than a specific date?
  24. Command to delete branches of Clearcase element with “0” versions
  25. What is composite baseline in UCM and when it will be used?
  26. How can I use ClearCase to “add to source control …” recursively?
  27. Python and ClearCase setview
  28. Command to find all view private files in the current directory recursively
  29. Clearcase plugin for eclipse usage
  30. what clearcase plugin to use with eclipse

Leave a Comment