RE: Need help with -kk, -kb, etc

[Josh Baudhuin]

Could you possibly not generally use the sticky -kk? Then you could use it 
deliberately when you're doing merges, and reset it once you've checked in the 
merged files?

> -----Original Message-----
> From: address@hidden [mailto:address@hidden Behalf Of
> Paul D. Schmidt
> Sent: Monday, July 30, 2001 10:39 AM
> To: address@hidden
> Subject: Need help with -kk, -kb, etc
> 
> 
> Our company uses the -kk option in our Makefiles to prevent
> keyword expansion, as that causes conflicts with merges.
> 
> The problem is that this option is sticky, and gets used for
> added files.  Not only is it sticky, but it also overrides the
> -kb option since we use -kk on the command line...
> 
> For example, if someone adds a .jar file and specifies it to be
> added with -kb, it's checked out with -kk and not -kb when -kk is
> (automatically, for all files) specified on the command line.
> 
> (-kk is not added to the command line for "production build mode"
> since we don't need to worry about merges, and actually want the
> $Id$, etc tags in there)
> 
> What is the best way to resolve this situation?  Any advice how
> we could better manage our repository would be greatly appreciated.
> 
> Thanks,
> -Paul
> 
> --
> [Paul D. address@hidden
> [Xtime, Inc................][........http://www.xtime.com]
> 
> "Everybody keeps saying that women are smarter than men, but did
>  you ever see a man wearing a shirt that buttons down the back?"
>                                  --Anonymous
> 
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/info-cvs
>