Re: binaries and the -kb option

[Eric Siegerman]

On Wed, Apr 30, 2003 at 05:35:11PM -0700, Kaz Kylheku wrote:
> On Wed, 30 Apr 2003, Richard Pfeiffer wrote:
> > wondering how I go about importing a project with
> > both binaries and text?  

If you can distinguish binary files by pathname, add appropriate
entries to CVSROOT/cvswrappers (or to per-directory .cvswrappers,
etc.), before doing the import.  If it's not that easy, read on...

> If you are on UNIX, then you are in luck because binaries and text
> files are the same. What you can do is just import everything as text,
> check it all out, and then use ``cvs admin'' to adjust the expansion
> mode of the binary files to -kb. This will work because CVS on UNIX
> will not do any line-ending munging on the binary files; they will be
> stored properly, just with the -kb mode missing. 

Then do a "cvs update -A".  The "-A" is needed to propagate the
changes in -k settings to your sandbox; a normal "cvs update"
won't do that.  I believe the -A will also refetch the files
themselves (I'll explain in a minute why you care); if not,
you'll have to delete them from your sandbox and do another "cvs
update".

As a final sanity check, you can diff your sandbox against the
original import tree.  (There will be innocuous differences --
CVS subdirectories if nothing else -- so you'll have to filter
those out.)

Why you want to refetch the binary files after changing their -k
settings:  If one of them happens to contain a string that looks
like an RCS keyword, it'll get munged even on UNIX.  But that
munging is done only at update time, *not* at import/commit time
(unlike newline conversions, which happen in both directions).
So changing the setting to -kb and then re-updating should fix
everything up.  Of course, doing the original import with "-ko"
would also prevent the munging.  You might well want to do that
anyway (but then again, maybe not...)

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
My Wine works.  However it crashes about half the time on startup.
Apparently their simulation of windoze API is getting too accurate.  :)
        - Kyle Sallee