Sheldon Samuels writes [in painfully long lines]:
>
> I have a related question. We have source files C++ and others, that
> are plain text, but chose to save as Binary to insure that CVS doesn't
> do keyword substitution on our files in inappropriate places. Since the
> code was pre-existing when we went to Open Source, we were concerned
> that there may be keywords in the code that were not intended to be
> keywords. So all files were added as binary just to be safe. Were we
> being too cautious?
Yes. What you really want is -ko, which preserves any existing keyword
strings rather than substituting new values but leaves the files as text
rather than binary.
> Will CVS attempt to merge these files, since they
> are text, or will it assume they are unreadable binary files.
If they're marked as binary CVS won't even attempt to do merges.
-Larry Jones
These pictures will remind us of more than we want to remember.
-- Calvin's Mom
