mergeclearcaseauto-generate

Is there a way to skip given files when performing a cleartool findmerge?


In our development environment, we have certain files that are autogenerated by some parsing tools, and they should never be merged from one branch to another. We do have them under source control, however, so that only one user needs to run the generation tool for any given branch; all other users will get the generated files automatically.

Is there a way to tell "findmerge" to skip these files when it traverses the VOB? If findmerge cannot resolve the differences in a file, it loads the default diff tool so the user can resolve the differences manually. For these autogenerated files, this is a waste of time; the user just has to cancel it and then run the autogeneration tool when the findmerge is complete.

If it matters, we use dynamic views.


Solution

  • You might consider the same approach as with binary files

    Your project manager can overcome this problem by creating a special element type for the binary file type and specifying one of the following mergetypes:

    never: A merge or findmerge operation ignores versions whose element type has never as a mergetype.

    So, as in this page, something like:

    cleartool mkeltype -supertype file -mergetype never -nc FILE_NEVER_MERGE
    

    And then, in the folder with your generated files (here for instance for XML files):

    ct find path/to/generated -type f -ele "{eltype(xml)}" -exec "cleartool chtype -force FILE_NEVER_MERGE %CLEARCASE