RE: changing files from binary mode

[Jim.Hyslop]

Derek Robert Price [mailto:derek@ximbiot.com] wrote:
> Jim.Hyslop wrote:
> >Wouldn't the 'cvs admin -kk' option work?
(sorry, I should've been more careful to specify -kkv)

> That depends.  If the original import was from Windows to, say, a UNIX
> server, then the `import -kb' failed to convert `\r\n' EOLs 
> to `\n' EOLs
> in the RCS archives when it should have.  Simply setting the mode to
> `-kk', or a more standard `-kkv', via `cvs admin' would not 
> remove those
> errant `\r's, meaning that the text files that had their mode changed
> would now check out with `\r\n' EOLs on UNIX and undergo conversion to
> `\r\r\n' EOLs upon checkout to Windows.

But this is really no different from changing a binary file originally
checked in without the -kb option. In that situation, you do this:

cvs admin -kb binary_file
cvs up -A binary_file
[replace with a good copy of the binary file]
cvs ci binary_file

Just replace 'kb' with 'kkv':

cvs admin -kkv text_file
cvs up -A text_file
(run file through a script that replaces \r\r\n with \r\n)
cvs ci text_file

I guess it's a matter of deciding which is less painful - re-importing the
files, or performing the above sequence of steps for each file.

-- 
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)