1 |
Sunday 24 Jan 2016 03:46:02, Gokturk Yuksek wrote : |
2 |
> Remove the paragraph about adding binary files to CVS. |
3 |
> Replace the instances of CVS with git. |
4 |
> |
5 |
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=558642 |
6 |
> Signed-off-by: Gokturk Yuksek <gokturk@××××××××××.edu> |
7 |
> --- |
8 |
> ebuild-maintenance/text.xml | 19 +++---------------- |
9 |
> 1 file changed, 3 insertions(+), 16 deletions(-) |
10 |
> |
11 |
> diff --git a/ebuild-maintenance/text.xml b/ebuild-maintenance/text.xml |
12 |
> index ac68dcd..10709ea 100644 |
13 |
> --- a/ebuild-maintenance/text.xml |
14 |
> +++ b/ebuild-maintenance/text.xml |
15 |
> @@ -42,22 +42,9 @@ above 20KB) which should be distributed as tarballs via the |
16 |
> <uri link="::general-concepts/mirrors/#suitable-download-hosts">Gentoo mirror system</uri> |
17 |
> so that people do not waste excessive amounts of bandwidth and hard drive |
18 |
> space. Also, you should not add binary (non-ASCII) files to the |
19 |
> -Portage CVS tree. If you need to do this in another CVS tree, for |
20 |
> -example, if you need to add a small PNG graphic for whatever reason, |
21 |
> -be sure to add it to CVS by using the <c>-kb</c> option, like so: |
22 |
> -</p> |
23 |
> - |
24 |
> -<pre caption="Adding binary files to CVS"> |
25 |
> -# <i>cvs add -kb myphoto.png</i> |
26 |
> -</pre> |
27 |
> - |
28 |
> -<p> |
29 |
> -The <c>-kb</c> option tells CVS that <path>myphoto.png</path> is a binary |
30 |
> -file and should be treated specially. For example, merging the |
31 |
> -differences between two different versions of this file should not be |
32 |
> -allowed to happen, for obvious reasons. Also, speaking of merging |
33 |
> +git tree. Also, speaking of merging |
34 |
> changes, any patches you add to Portage should generally <e>not</e> be |
35 |
> -compressed. This will allow CVS to merge changes and correctly inform |
36 |
> +compressed. This will allow git to merge changes and correctly inform |
37 |
> developers of conflicts. |
38 |
> </p> |
39 |
> |
40 |
> @@ -149,7 +136,7 @@ simply, <path>1.0-gentoo.diff</path>. Also note that the |
41 |
> <path>gentoo</path> extension informs people that this patch was created |
42 |
> by us, the Gentoo Linux developers, rather than having been grabbed from a |
43 |
> mailing list or somewhere else. Again, you should not compress these |
44 |
> -patches because CVS does not play well with binary files. |
45 |
> +patches because git does not play well with binary files. |
46 |
> </p> |
47 |
> |
48 |
> <p> |
49 |
> -- |
50 |
> 2.4.10 |
51 |
> |
52 |
> |
53 |
|
54 |
"Again you should not compress these patches because git does not play well |
55 |
binary files". |
56 |
|
57 |
I'm not sure this statement still holds true with git. Does it? |
58 |
-- |
59 |
Patrice Clement |
60 |
Gentoo Linux developer |
61 |
http://www.gentoo.org |