info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Binary files and sticky keyword substitution


From: Eric Siegerman
Subject: Re: Binary files and sticky keyword substitution
Date: Fri, 12 Jul 2002 20:02:25 -0400
User-agent: Mutt/1.2.5i

On Fri, Jul 12, 2002 at 01:54:02PM +0200, address@hidden wrote:
> The problem is that each code file has at least a difference due to the 
> keyword
> substitution (different
> revision numbers). The way to handle this seems to be :
> 
> cvs up -kk -j branch-tag
> 
> This avoids the differences due to the keyword substitution (different 
> revision
> number), but
> the '-kk' option is sticky and applies to all the files, even the *.gif ones.

Yes, this is a problem.  Ideally, "-k<whatever>" on the command
line would *not* override "-kb" in the file, but *would* override
any other -k setting.  (There would of course then be a need for
a way to say, "yes, please do override -kb" -- perhaps something
like "-kk!" or "-kkf" ("f" for "force").)

> What I don't understand is if the '-kk' has (or may have) somehow altered the
> binary files
> coming from the repository (where they were correctly stored).

It depends.  If you're on UNIX, the files will be ok unless they
happen to contain something that looks like a CVS keyword.  If
you're on Windows (or anything that uses a line-ending convention
different from UNIX's), the binary files will be corrupted.

So it's wise *not* to depend on "cvs up -kk" to work with binary
files.

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
Anyone who swims with the current will reach the big music steamship;
whoever swims against the current will perhaps reach the source.
        - Paul Schneider-Esleben



reply via email to

[Prev in Thread] Current Thread [Next in Thread]