To merge the latest version to a hijacked file

About this task

If you are working with a shared set of versions and someone has checked in a newer version of the file while it was hijacked in your view, you are prevented from checking in the file.

You have to merge the latest version in the VOB with the checked-out file before the checkin is allowed. Use one of the following methods to accomplish this:

Procedure

  • To merge the latest version in the VOB to the checked-out version in your view using a command shell, enter the following command:
    cleartool merge -graphical -to file-or-directory-in-your-view file-or-directory-name@@/main/LATEST
    Note: @@/main/LATEST is a version-extended path.
    For example:
    
    % cleartool merge -graphical -to prog.c   prog.c@@/main/LATEST 
    
    Using the -graphical option starts the Diff Merge tool. After merging, save the results and check in the version by entering the cleartool checkin command from the view.
  • On Windows systems, you can begin this process by issuing the Check In command. When you issue the Check In command for a nonlatest version, a window opens to ask whether you want to merge the file now. If you choose to merge, an attempt is made to merge automatically. The Diff Merge tool starts if your input is needed to complete the merge. After the merge, you are prompted to check in the file.