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

[Derek R. Price]

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


> 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.


> 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.

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
Honesty is the 1st chapter in the book of wisdom.