Clear Case concepts

#1 Clear Case merge

Merge on clear case Diff Merge tools might look confusing at times. Here are 2 scenarios of merging on Diff Merge.

Rebase:

1st window is the base window which contains the version of the file from which the change was made. The changes, made by other and delivered to integration stream, are shown on the 2nd window. And the 3rd window shows the Development stream to which you'd rebase.

Deliver:

1st window is the base window which contains the version of the file from where you've started work on the file and made necessary changes. 2dn window shows the changes now you've in your development stream. And the 3rd window shows Integration stream to which you're going to deliver your changes.

Resources:

http://clearcase.weintraubworld.net/ - not-so-official clear case website
http://clearcase.weintraubworld.net/cc.branch.html#real - Branching theory of clear case
http://clearcase.weintraubworld.net/cc.branch2.html - Branching strategy

Useful ClearCase commands

Frequently used cleartool commands:

List out the checked out files
cleartool> lsco

Check in a file
cleartool>ci [-nc] filename

Check out a file
cleartool>co filename

Undo a check out
cleartool>unco filename

Add a file to source control
cleartool>mkelem filename


Resources:

http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?cmd=getdoc&coll=0530&db=man&fname=1%20cleartool - Contains list of commands
http://www.ibm.com/developerworks/rational/library/836.html - cheat sheet