Re: [gentoo-dev] [PATCH v2 08/19] ebuild-maintenance: rewrite the text on adding binary files to the tree #558642

[Brian Dolbec]

-----BEGIN PGP SIGNED MESSAGE-----

Hash: SHA512



On Sun, 24 Jan 2016 18:44:08 -0500

Göktürk Yüksek <gokturk@××××××××××.edu> wrote:



> Andrew Savchenko:
> > On Sun, 24 Jan 2016 16:00:31 +0100 Patrice Clement wrote:
> >> 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 <gokturk@××××××××××.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?
> >
> > What about repoman checks? Will it still yell at >20 kB patches?
> >
> Yessir:
> https://gitweb.gentoo.org/proj/portage.git/tree/pym/repoman/checks/ebuilds/fetches.py?h=v2.2.27#n104
>
> Even though it's not an issue with the git tree, rsync users will
> still suffer for >20kB patches.
>
> > Best regards, Andrew Savchenko
> >
>
> - --
> gokturk
>
>


just for future reference, here it is again in the repoman rewtire code

waiting to be merged and likely be in the next release:



https://gitweb.gentoo.org/proj/portage.git/tree/pym/repoman/modules/scan/fetch/fetches.py?h=repoman#n109



- -- 

Brian Dolbec <dolsen>



-----BEGIN PGP SIGNATURE-----

Version: GnuPG v2.1



iQJ8BAEBCgBmBQJWpXF6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w

ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNUQ3Qzc0RTA4MUNDNzBEQjRBNEFBRjVG

QkJEMDg3Mjc1ODIwRUQ4AAoJEPu9CHJ1gg7YV6IP/34NmzdtaMg4W471cXYn8pR0

8JdcHkC2YehpNNzSjDbWmI9pEArBS/3yWC8lfXMeu21GU66OUb6eKR5KMURg5OP9

FT4DJCHO9RWK31QEOD03PLZXhoaw6JgYQpvjbnWP1CN8mdWg7CeA0r0y4BPe63Kp

FGpFZXjduszpT1ALIt86tN85pB9jmYdwDgj9vLWG6SyThFuA6aDeEHSaAB05blDU

p6NVksGfSG6bbS+Kok1uRdF5vVqBQU+aSxNbZW9mpRtYDtdr5DoInbq/uXz/Dy1S

Kp7iDg8+SW3nwA60vqss5SZmZDW3cnEH1XWIdEgDjH4NBvlaVnA9yxIa12MJ6qSy

FZ+5F5HVAdRs8eLK0OsK/RbFm4gCEFxmhm6YJ2qXpIXuD/MM4GJXJa+O7qrURzqI

td5rJNTHGbIBmwDjJwotwyuT+FgWajicbrnQpxgiLoNYcvvB7mihwT+DFKx4WxWm

rw2O21fFaUD/OQp255y0OLyVfVC6SRk3UXXlDd9Pl+UYLLIyC6ibVI4dxDxp4hd2

DGUTQ2FFm3m4h5RTxeCJNJgTMlKSbCyDut6vM8mMyIzMxcD5nfWFv53KNIbOPfGH

vmUbc5scrhKLiawzos2w+ChzGkzGParzCF7rZ1S2nOlJFt87qgVVs7JNVUJ0D1QX

XlmqJV+fmRhaDLRXNVQA

=gmwE

-----END PGP SIGNATURE-----