Re: -kk and -kb aren't getting along

[Mental]

On Tue, Dec 19, 2000 at 01:28:47PM -0500, Derek R. Price wrote:
> Mental wrote:
> 
> > We're using cvs 1.10 on solaris. The issue is that some of the content is
> > binary. I setup the cvswrappers so that the commonly added binary files
> > get added with the -kb sticky options.
> 
>     http://cvshome.org/docs/manual/cvs_5.html#SEC64
> 

Thank you, I saw this earlier here: 
http://durak.org/cvswebsites/doc/cvs_64.php#SEC64

The bit at the end specificly concerning mixing -kk with -kb is what
alarmed me.


> 
> > The real questions I have are:
> >
> > 1. Is there a way to make the -kb stay. For good.
> 
> See above.  But it didn't really go away.  It's only attached to your working
> files.

So cvs isnt really doing anything to the files so much as tracking sticky
options on the branch? If thats correct then it shouldnt break anything
but files that were added to the repository incorrectly, yes?

> 
> 
> > If thats not an option:
> >
> > 2. Would it be acceptable to use -kk to merge the code, then use a shell
> > script to use the cvs admin command to reset the binary flag on the files
> > that need it?
> 
> See above.  I *think* you can actually do an 'update -A' after your merge to
> get rid of all sticky tags and then do a fresh checkin.  Assuming you're on
> the trunk.  Not sure what the trick is on a branch.  Not sure any of this
> will work at all.  Be very careful.  Backup everything before trying.  Don't
> blame me for lost data.

You can do an update -A on the branch, but that pretty much means you're
working on the trunk then. It does indeed drop the sticky options (reverts
to -kb). 


Now, the thing is, I've done some experimenting and the version number
isnt changing. Commits dont ask for a log message, so I imagine that nothing 
is happening to the binarys. It seems to me that when you do the update -kk
-j to do the merge that nothing 'bad' is being done to the binary files.

Functionally, how is -kk different from -kb? If I checkin a binary with
the sticky options -kk, what 'bad' thing could happen to it? You're
correct in that the -kb tag on the trunk is not overridden by the -kk tag
on the branch. There doesnt _seem_ to be anything broken. Doesnt the -kb
tag tell cvs (among other things) not to look for keywords to expand?

I think I'm fairly safe at this point. Nothing seems to have broken in my
tests. It seems (and this is pretty untested) that as long as the initial
add was done with the -kb switch that things are ok. I would be very
pleased if this this were the correct conclusion. 

Thank you very much for the feedback.


--
Mental

"You are not special. You are not a
beautiful or unique snowflake. You are
the same decaying organic matter as
everything else."
~Tyler~

pgpEPNyMMODrA.pgp
Description: PGP signature