From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.gentoo.org (smtp.gentoo.org [134.68.220.30]) by robin.gentoo.org (8.13.4/8.13.4) with ESMTP id j3P3Dqi5017418 for ; Mon, 25 Apr 2005 03:13:53 GMT Received: from tirpitz.iat.sfu.ca ([209.87.56.17]) by smtp.gentoo.org with esmtp (Exim 4.43) id 1DPu2k-0006YB-Iu for gentoo-dev@lists.gentoo.org; Mon, 25 Apr 2005 03:13:54 +0000 Received: (qmail 3992 invoked from network); 24 Apr 2005 20:13:52 -0700 Received: from s01060050da688d47.vc.shawcable.net (HELO curie.orbis-terrarum.net) (24.80.100.253) by tirpitz.iat.sfu.ca with AES256-SHA encrypted SMTP; 24 Apr 2005 20:13:52 -0700 Received: (qmail 7439 invoked by uid 10000); 24 Apr 2005 20:13:53 -0700 Date: Sun, 24 Apr 2005 20:13:53 -0700 From: "Robin H. Johnson" To: Gentoo Developers Subject: Re: [gentoo-dev] Committing straight to stable Message-ID: <20050425031353.GA6645@curie-int.orbis-terrarum.net> Mail-Followup-To: Gentoo Developers References: <20050424144444.58715f9c@snowdrop> <1114391088.20022.12.camel@localhost> <20050425014437.GA1461@curie-int.orbis-terrarum.net> <426C504A.6030806@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@gentoo.org Reply-to: gentoo-dev@lists.gentoo.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="vkogqOf2sHV7VnPd" Content-Disposition: inline In-Reply-To: <426C504A.6030806@gentoo.org> User-Agent: Mutt/1.5.8i X-Archives-Salt: cb4adc5e-8af1-43de-b9ff-f2e97931bd38 X-Archives-Hash: 6a9de581dbf55536fa6754379ea8dad0 --vkogqOf2sHV7VnPd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 t= o a file. The CVS manual states: `-ko'=20 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 appe= ared when the file was checked in.=20 `-kb'=20 Like `-ko', but also inhibit conversion of line endings between the canonic= al form in which they are stored in the repository (linefeed only), and the fo= rm 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.=20 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 @%$&@%$^). --=20 Robin Hugh Johnson E-Mail : robbat2@orbis-terrarum.net Home Page : http://www.orbis-terrarum.net/?l=3Dpeople.robbat2 ICQ# : 30269588 or 41961639 GnuPG FP : 11AC BA4F 4778 E3F6 E4ED F38E B27B 944E 3488 4E85 --vkogqOf2sHV7VnPd Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux) Comment: Robbat2 @ Orbis-Terrarum Networks iD8DBQFCbGBxPpIsIjIzwiwRAjrhAJ9a6ZqHRO26P7s4SjM4uOL1DuWyvgCguamP QkHLtaGymQiEMf2Tt+F5P8I= =gHJT -----END PGP SIGNATURE----- --vkogqOf2sHV7VnPd-- -- gentoo-dev@gentoo.org mailing list