Sunday, November 21, 2010

Clearcase: How do I merge in a specific file from one view, into another, to avoid the Evil Twin scenario?

I no longer have access to a clearcase environment, so this is from memory, but what you want is to link in a version from another branch into the one that you are working with.

Let's assume that you have a file new_file that have been added on the branch new_feature (the latest version is new_file@@/main/new_feature/5) which you want to merge/bring into the branch maintenance.

prompt>cleartool checkout -nc .checking out some_dir@@/main/maintenance/2...prompt>cleartool ln .@@/main/new_feature/LATEST/new_file/main/new_feature/5 ....prompt>cleartool ci -c "linked in .@@/main/new_feature/LATEST/new_file/main/new_feature/5"prompt>

The commands above are probably not 100% correct, but should give you the idea. You want to use cleartool ln to avoid evil twins, because that will bring in a version from the already existing element (i.e. not creating a new twin).


View the original article here

No comments:

Post a Comment