Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Merge arrow in clear case

Tags:

clearcase

I have to merge all objects from a sub branch to main branch recursively. I would like to merge manually by check in the code from sub branch to main branch instead of using merge command in clear case. So after the check in into the main branch I would like to draw arrow recursively to all my objects. ic from sub branch to main branch

I have used this command

cleartool mkhlink -unidir Merge <sub branch path>>@@/main/<<sub branch>> <<main brach path>>@@/main/LATEST 

But when I dit it, it is drawing the arrow for the directory only not for all contains of the directory.
Please suggest how to draw the arrow recursively from sub branch to main branch objects. Thanks in advance

like image 728
cheiav Avatar asked Dec 23 '22 05:12

cheiav


1 Answers

According to the merge man page,

cleartool merge -ndata -to aFile -version /main/a/SourceVersion /main/a/DestVersion

will draw a red arrow without performing any actual merges.

Since you have made your checkout/checkings in a branch or a UCM activity, what you need to do is:

  • be in your destination view (the one where the merge occurred)
  • query all the versions you made for that merge
  • extract the file for each version
  • extract the destination version
  • compute the source version (for instance /main/aBranch/LATEST)
  • do a "merge -ndata"

So, it is not so much a "recursive" algorithm, but rather an enumeration of all versions involved in this merge in order to draw the appropriate red arrows.

like image 116
VonC Avatar answered Jan 05 '23 13:01

VonC