Re: [gentoo-dev] Committing straight to stable

[Robin H. Johnson]

On Sun, Apr 24, 2005 at 07:04:58PM -0700, Donnie Berkholz wrote:
> Robin H. Johnson wrote:
> > You aren't the first no, but the solutions to it are limited:
> > - teach developers to use -kb where they should
> Wouldn't it be -ko for a patch?
-kb is actually better than -ko, due to how it's handled on later commits to a file.

The CVS manual states:
`-ko' 
Generate the old keyword string, present in the working file just before it was
checked in. For example, for the Revision keyword, generate the string
$Revision: 1.1 $ instead of $Revision: 5.7 $ if that is how the string appeared
when the file was checked in. 
`-kb' 
Like `-ko', but also inhibit conversion of line endings between the canonical
form in which they are stored in the repository (linefeed only), and the form
appropriate to the operating system in use on the client. For systems, like
unix, which use linefeed only to terminate lines, this is very similar to
`-ko'. For more information on binary files, see Handling binary files. In CVS
version 1.12.2 and later `-kb', as set by cvs add, cvs admin, or cvs import may
not be overridden by a `-k' option specified on the command line. 

Note the last sentence again:
In CVS version 1.12.2 and later `-kb', as set by cvs add, cvs admin, or cvs
import may not be overridden by a `-k' option specified on the command line.

So this makes it much harder to break on later revisions as compared to -ko.

Also, if you have inconsistant linefeeds, cvs -ko can break sometimes (some
versions of Outlook mangled patches in this way @%$&@%$^).

-- 
Robin Hugh Johnson
E-Mail     : robbat2@××××××××××××××.net
Home Page  : http://www.orbis-terrarum.net/?l=people.robbat2
ICQ#       : 30269588 or 41961639
GnuPG FP   : 11AC BA4F 4778 E3F6 E4ED  F38E B27B 944E 3488 4E85