|
Line
Link Here
|
| 0 |
-- gentoo-projects/www-redesign/htdocs/proj/en/devrel/handbook/hb-guide-ebuild.xml |
0 |
++ gentoo-projects/www-redesign/htdocs/proj/en/devrel/handbook/hb-guide-ebuild.xml |
|
Lines 74-97
Link Here
|
| 74 |
Exceptions to this rule are for larger patch files (we recommend this for patches |
74 |
Exceptions to this rule are for larger patch files (we recommend this for patches |
| 75 |
above 20KB) which should be put onto the Gentoo mirrors so that people |
75 |
above 20KB) which should be put onto the Gentoo mirrors so that people |
| 76 |
do not waste excessive amounts of bandwidth and hard drive |
76 |
do not waste excessive amounts of bandwidth and hard drive |
| 77 |
space. Also, you should not add binary (non-ASCII) files to the |
77 |
space. Also, you should <e>never</e> add binary (non-ASCII) files to the |
| 78 |
Portage CVS tree. If you need to do this in another CVS tree, for |
78 |
Portage CVS tree. Any patches you add to Portage should generally <e>not</e> be |
| 79 |
example, if you need to add a small PNG graphic for whatever reason, |
79 |
compressed. This will allow CVS to merge changes and correctly inform developers |
| 80 |
be sure to add it to CVS by using the <c>-kb</c> option, like so: |
80 |
of conflicts. |
| 81 |
</p> |
|
|
| 82 |
|
| 83 |
<pre caption="Adding binary files to CVS"> |
| 84 |
# <i>cvs add -kb myphoto.png</i> |
| 85 |
</pre> |
| 86 |
|
| 87 |
<p> |
| 88 |
The <c>-kb</c> option tells CVS that <path>myphoto.png</path> is a binary |
| 89 |
file and should be treated specially. For example, merging the |
| 90 |
differences between two different versions of this file should not be |
| 91 |
allowed to happen, for obvious reasons. Also, speaking of merging |
| 92 |
changes, any patches you add to Portage should generally <e>not</e> be |
| 93 |
compressed. This will allow CVS to merge changes and correctly inform |
| 94 |
developers of conflicts. |
| 95 |
</p> |
81 |
</p> |
| 96 |
|
82 |
|
| 97 |
<p> |
83 |
<p> |
|
Lines 2239-2242
Link Here
|
| 2239 |
</body> |
2225 |
</body> |
| 2240 |
</subsection> |
2226 |
</subsection> |
| 2241 |
</section> |
2227 |
</section> |
| 2242 |
</sections> |
2228 |
</sections> |
