-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Patrice Clement: > Sunday 24 Jan 2016 03:46:02, Gokturk Yuksek wrote : >> Remove the paragraph about adding binary files to CVS. Replace >> the instances of CVS with git. >> >> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=558642 >> Signed-off-by: Gokturk Yuksek <gokt...@binghamton.edu> --- >> ebuild-maintenance/text.xml | 19 +++---------------- 1 file >> changed, 3 insertions(+), 16 deletions(-) >> >> diff --git a/ebuild-maintenance/text.xml >> b/ebuild-maintenance/text.xml index ac68dcd..10709ea 100644 --- >> a/ebuild-maintenance/text.xml +++ b/ebuild-maintenance/text.xml >> @@ -42,22 +42,9 @@ above 20KB) which should be distributed as >> tarballs via the <uri >> link="::general-concepts/mirrors/#suitable-download-hosts">Gentoo >> mirror system</uri> so that people do not waste excessive amounts >> of bandwidth and hard drive space. Also, you should not add >> binary (non-ASCII) files to the -Portage CVS tree. If you need to >> do this in another CVS tree, for -example, if you need to add a >> small PNG graphic for whatever reason, -be sure to add it to CVS >> by using the <c>-kb</c> option, like so: -</p> - -<pre >> caption="Adding binary files to CVS"> -# <i>cvs add -kb >> myphoto.png</i> -</pre> - -<p> -The <c>-kb</c> option tells CVS >> that <path>myphoto.png</path> is a binary -file and should be >> treated specially. For example, merging the -differences between >> two different versions of this file should not be -allowed to >> happen, for obvious reasons. Also, speaking of merging +git >> tree. Also, speaking of merging changes, any patches you add to >> Portage should generally <e>not</e> be -compressed. This will >> allow CVS to merge changes and correctly inform +compressed. >> This will allow git to merge changes and correctly inform >> developers of conflicts. </p> >> >> @@ -149,7 +136,7 @@ simply, <path>1.0-gentoo.diff</path>. Also >> note that the <path>gentoo</path> extension informs people that >> this patch was created by us, the Gentoo Linux developers, rather >> than having been grabbed from a mailing list or somewhere else. >> Again, you should not compress these -patches because CVS does >> not play well with binary files. +patches because git does not >> play well with binary files. </p> >> >> <p> -- 2.4.10 >> >> > > "Again you should not compress these patches because git does not > play well binary files". > > I'm not sure this statement still holds true with git. Does it? > It should be possible to compress the patches and use gitattributes[1] to tell git to decompress them before diffing. But doing so is not needed since git compresses its objects in the first place. Maybe we can rewrite this as "You should not compress these patches because git compresses them upon commit transparently."
With that being said, git may in fact not play well with binary files given that there is an extension to handle binary files[2]. [1] https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#Binary-Files [2] http://www.infoq.com/news/2015/04/github-large-file-storage - -- gokturk -----BEGIN PGP SIGNATURE----- iQEcBAEBCgAGBQJWpP4NAAoJEIT4AuXAiM4zhNkH/jcQBQG/omfDSjbE/zBYjm+E L6omW3vmaSHUwAt7YG62Nmnp2dh3s7xBIl09f1VhAEDxvj9lQR+VtyWZhQFMEnQ8 OZb4o97h/PWUsI4qEuWRENGEzhI3vQDGDIRJhvxDlzgwTXUtMS89PvPIducc/HUf 9a81AHc8a7kRKFNmaaQj2pxuf1zQ6K7tZh9SMvZh31bqkPDgLNHVy1eJregB5IM/ 0lzZuODsXDuWMBE2awP9Y02MUEspjPt2RaAhSXa2StCaUcCmd6RmX+aSaQxb3C05 tXXNadXyws5Lg6HvtnQq6Xb1Sz/G5gUJRnJ9IFIK8B8fGYuqaJgb+uUqIAGboFY= =xn2m -----END PGP SIGNATURE-----
