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