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