I need to be able to provide the CVS server with a directive that forces a merge using the cvswrappers functionality, overriding CVS's default COPY behavior for files marked as '-kb'.
Without adding complications of explaining our build process suffice it to say there is a requirement that all sources, regardless of the platform on which they build/run, are checked out on UNIX. This of course causes all files to have UNIX line endings-- unless the files are -kbe'ed, in which case line endings are untouched. The lack of a CR/LF line ending format cause file read errors by IDE's such as MS VB-- unless line endings are preserved by way of marking the files as binary, i.e. '-kb'. But then there is no merge-- only copy. What I really need, since many of the IDE files are truly ascii text, is to using the MERGE directive to *force* the merge of the selected files. Here is an example of what I have in cvswrappers: # Visual Basic Formats *.[Cc][Ll][Ss] -k 'b' -m 'MERGE' But, the MERGE directive is being ignored, and a COPY is instead occurring. I really need this flexibility... hopefully I am just doing something wrong, or maybe a later version of the server will do. Presently using CVS 1.11.1p1 on Solaris 2.8. Thanks!!! _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
