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.
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.