Topic
  • 1 reply
  • Latest Post - ‏2013-01-30T15:52:30Z by brcowan
SystemAdmin
SystemAdmin
47293 Posts

Pinned topic how to merge the another branch new elements to parent dir .

‏2013-01-30T09:46:04Z |
Hi All,

We are having elements in /main/bug1/Latest branch and we have to merge these elements to /main/emr/sol8_emr/locmkt/loct_sol10 branch .

Please let me know the command to merge in clearcase unix .

Regards
MM
Updated on 2013-01-30T15:52:30Z at 2013-01-30T15:52:30Z by brcowan
  • brcowan
    brcowan
    743 Posts

    Re: how to merge the another branch new elements to parent dir .

    ‏2013-01-30T15:52:30Z  
    The findmerge man page is probably the best place to start. The process to perform the merge would be:
    1) Set into a view that selects the DESTINATION branch (which looks to be "/main/emr/sol8_emr/locmkt/loct_sol10")
    2) CD to the desired directory and run a findmerge command similar to the following:
    cleartool findmerge . -fversion /main/bug1/LATEST -merge
    


    This should give you a start to do the merges. This will merge the current directory (which will bring over directory entries for files added on the other branch) and then merge the files themselves.

    =================================================================
    Brian Cowan
    Advisory Software Engineer
    ClearCase Software Advisory Team (SWAT)
    Rational Software
    IBM Software Group
    550 King St
    Littleton, MA 01460

    Phone: 1.978.899.5436
    Web: http://www.ibm.com/software/rational/support/
    Updated on 2014-03-26T13:43:32Z at 2014-03-26T13:43:32Z by iron-man