Clearcase code merge on Unix

Following are the steps to perform a merge from branch1 (for say release1.0) to branch 2 (for say release 2.0) in clearcase on a Linux system:
1. Create a view to branch 2 where you want to merge the code to and set to the view. Then launch clearcase merge manager GUI.

$ clearmrgman

2. The merge manager wizard will prompt for the following:

• Step 1 - Specify the dynamic or path to snapshot view
• Step 2 - Select the elements you want to consider for merge
• Step 3 - Select where you want to merge from by branch name, label name or from another clearcase view.
• Step 4 – merge options like:
• auto merge for directories – default yes
• auto merge files in the directories – default yes
• follow VOB symbolic links – default no

3. Once the merge completes, if there are any merge errors requiring manual resolution then those files are shown and one by one you can resolve them.
4. Once the merge is completed, all files modified, added or unloaded due to merge are in checked out state and require check in. So check in the files.
For more details, please refer the following:

• Clearmrgman reference doc
• How to merge using the clearcase merge manager
• A very nice, succinct clearcase quick reference

A clearcase pre-code delivery check script

The following script finds all hijacked or checked out files recursively in the directories starting from the current working directory and dumps the data in an output.txt file.

@echo off

set output=c:\output.txt

echo Pre Delivery script started @ %TIME%

if exist "%output%" del "%output%"

echo List of Hijacked files in %CD%.  >> "%output%"

echo _______________________ >> "%output%"

echo Finding hijacked files. Please wait...

cleartool ls -recurse | findstr "hijacked" >>c:\output.txt

echo List of View Private files in %CD%. >> "%output%"

echo Finding view private files. Please wait...

echo ___________________________ >> "%output%"

cleartool ls -r -s -view_only| findstr /V ".contrib \\dist\\ \\build\\ dist .keep .class" >> "%output%"

start notepad "%output%"

echo Pre Delivery script completed  @ %TIME%. Please refer c:\output.txt file for hijacked and view private files

Converting from RHEL 6 to Centos 6.2

I recently installed RHEL 6 (workstation) but had not yet purchased an RedHat Network subscription when i learned that i can change it to Centos very easily and then updates will work off of Centos repository. So i upgraded RHEL 6 to Centos 6.2 with the following commands executed in order:

yum clean all
mkdir ~/centos
cd ~/centos
wget http://mirror.centos.org/centos/6.2/os/x86_64/RPM-GPG-KEY-CentOS-6
wget http://mirror.centos.org/centos/6.2/os/x86_64/Packages/centos-release-6-2.el6.centos.7.x86_64.rpm
wget http://mirror.centos.org/centos/6.2/os/x86_64/Packages/yum-3.2.29-22.el6.centos.noarch.rpm
wget http://mirror.centos.org/centos/6.2/os/x86_64/Packages/yum-utils-1.1.30-10.el6.noarch.rpm
wget http://mirror.centos.org/centos/6.2/os/x86_64/Packages/yum-plugin-fastestmirror-1.1.30-10.el6.noarch.rpm
rpm --import RPM-GPG-KEY-CentOS-6
rpm -e --nodeps redhat-release-server
rpm -e yum-rhn-plugin rhn-check rhnsd rhn-gnome-setup rhn-setup
rpm -Uhv --force *.rpm
yum upgrade
reboot

 This above is based on http://yo61.com/upgrading-rhel-6-2-to-centos-6-2.html blog post.