http://www.wilcoxd.com/blog/cvs-is-dumb-sometimes.html Blog for project status and lab notes Sun, 12 Oct 2008 00:21:43 +0000 http://wordpress.org/?v=2.0.3 http://www.wilcoxd.com/blog/cvs-is-dumb-sometimes.html#comment-2 Wed, 07 Apr 2004 19:15:39 +0000 http://www.wilcoxd.com/blog/cvs-is-dumb-sometimes.html#comment-2 Sometimes CVS is not so dumb. Use the -kk option to "kill keywords" and CVS won't expand those keywords, causing spurious conflicts. This has some weird interactions with the -kb option, so if you've been using that (perhaps on binary files in CVS) you will want to study the manual and try it out first. Sometimes CVS is not so dumb. Use the -kk option to “kill keywords” and CVS won’t expand those keywords, causing spurious conflicts. This has some weird interactions with the -kb option, so if you’ve been using that (perhaps on binary files in CVS) you will want to study the manual and try it out first.

]]>