Re: Proposal to fix CVS binary file implementation

[Paul Sander]

I agree in principle with your statements and your proposal, but I observe
two omissions:

1. There is a class of text file that is not mergeable, but requires newline
conversion.  CVS does not currently support that class of file, but I
believe it should.  Supporting that class of file would mean adding up to
four more keyword expansion modes, and modify CVS to apply the proper merge
semantics.  Examples of such files include Frame Maker MIF documents and
uuencoded files.  It could be argued that Rich Text and HTML fall into this
category also.

2. Some people like keyword expansion, despite its effect on merges.


--- Forwarded mail from address@hidden

Here's what I would propose (and I underscore *propose*):
1)  Maintain the current keyword expansion modes, as persisted in the =
archive or in the local working area in the Entries file as "kv, kvl, k, =
o, b, or v";
AND
2)  EITHER:
     a) Provide a new command line keyword expansion option "-km" on cvs =
update and cvs checkout to support merging.  The effect would be that =
the working area local keyword substitution mode would overridden to "k" =
for all but binary files, which would remain "b".
     OR
     b) Change the current behavior of update and checkout to never =
override the archive-stored default keyword substitution mode for binary =
files.

--- End of forwarded message from address@hidden