Clearcase: findmerge usage

后端 未结 1 799
太阳男子
太阳男子 2020-12-06 14:27

I have a branch B1 and another branch B2. I want all files/subfolders (recursively) inside a particular folder X (and not on entire VOB) on B1 to be merged onto B2.

1条回答
  •  無奈伤痛
    2020-12-06 15:20

    After checkin the findmerge man page:

    You shouldn't need to merge first the directories, then the files.
    findmerge should do the right merges (directories, then files) all by itself.

    cleartool findmerge . -nc -fver .../dev/LATEST -merge
    

    should be enough.

    cleartool findmerge . -nc -fver .../dev/LATEST -print
    

    will print what needs to be merged, but will stop at the directories.

    0 讨论(0)
提交回复
热议问题