Re: Proposal to fix CVS binary file implementation

[David L. Martin]

From: "Derek R. Price" <address@hidden>

>
> Or create an extra expansion mode which isn't overridden by options passed
to
> update or checkout but can still be changed using cvs admin.  Then there
aren't
> any modes it doesn't make sense to attach permanently to a file.  Not sure
what
> issues that raises with backwards compatibility with RCS, though...
>
> Derek

I'd be concerned with the backward compatibility with RCS.  The -kb option
was added in RCS 5.7 (if the documentation I'm reading is accurate).  I'd be
wary of adding an additional saved keyword expansion mode.  But your point
is valid to try to achieve consistency between command line options and the
expansion modes that can be stored in the archive.  Perhaps it is better not
to introduce a new command line option at all and to just refine the current
behavior.

Along those lines, I've implemented and attached a patch to CVS 1.11 in the
file vers_ts.c which I'm now testing to implement the following:

2b) Change the current behavior of update and checkout to never
override the archive-stored default keyword substitution mode for binary
files.

So far, so good - it appears to work as desired (binary files are immutably
assigned '-kb', regardless of the command line option for checkout or update
supplied), tested in the following cases:

Solaris local (1.11 + patch)
Solaris client (1.11), Solaris server (1.11 + patch)
WinCVS 1.1b13 client (1.1b13), Solaris server (1.11 + patch)

If anyone knows of pitfalls or other areas that must be considered (of which
I'm blissfully unaware), please let me know.

David Martin

patch.txt
Description: Text document