Merge arrow in clear case

烈酒焚心 提交于 2019-11-27 15:22:20

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.

Just use the ClearCase Merge Manager - it should take all the pain out of doing a task like this.

David Kosc

I know this is 8 months later but have you tried this?

cleartool find . -type f -nxname -exec 'cleartool merge -to $CLEARCASE_PN -ndata -version /main/aBranch/LATEST '

Probably do not need the -nxname in the first part. I changed to the directory that I wanted to create only merge arrows to and did a FIND for everything in the directory.

标签
易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!