diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2017-02-26 17:49:40 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2017-02-28 22:41:03 +0100 |
| commit | 7d8a3d00c1975646d21a84496aecc57bcefd7b1a (patch) | |
| tree | acf5e6c7b750cfef301ecd4579dea3d8388216fc /ebuild-writing | |
| parent | Remove CVS $Id$ lines from all ebuild examples. (diff) | |
| download | devmanual-7d8a3d00c1975646d21a84496aecc57bcefd7b1a.tar.gz devmanual-7d8a3d00c1975646d21a84496aecc57bcefd7b1a.tar.bz2 devmanual-7d8a3d00c1975646d21a84496aecc57bcefd7b1a.zip | |
ebuild-writing: Delete obsolete sections about CVS keyword expansion.
Git doesn't by default expand any keywords like $Id$ or $Date$, so
patches can be committed like any other file.
Diffstat (limited to 'ebuild-writing')
| -rw-r--r-- | ebuild-writing/functions/src_prepare/epatch/text.xml | 14 | ||||
| -rw-r--r-- | ebuild-writing/misc-files/patches/text.xml | 19 |
2 files changed, 0 insertions, 33 deletions
diff --git a/ebuild-writing/functions/src_prepare/epatch/text.xml b/ebuild-writing/functions/src_prepare/epatch/text.xml index 6cdff0d..b873661 100644 --- a/ebuild-writing/functions/src_prepare/epatch/text.xml +++ b/ebuild-writing/functions/src_prepare/epatch/text.xml @@ -67,20 +67,6 @@ src_prepare() { Remember to add the patch to <c>SRC_URI</c>. </p> </body> - -<subsection> -<title>Git Keyword Expansion Lines and Patches</title> -<body> -<p> -If your patch includes any changes to Git <c>$Id$</c> -(or <c>$Date$</c>) lines, it cannot be -distributed under <c>files/</c>, since Git will clobber the patch when -keywords are expanded on the staging box. In these situations, either remove this hunk of the patch -manually, or mirror the file. See <uri link="::general-concepts/git-to-rsync"/>. -</p> -</body> -</subsection> - </section> <section> diff --git a/ebuild-writing/misc-files/patches/text.xml b/ebuild-writing/misc-files/patches/text.xml index f0b1f13..506871f 100644 --- a/ebuild-writing/misc-files/patches/text.xml +++ b/ebuild-writing/misc-files/patches/text.xml @@ -101,25 +101,6 @@ from the <c>vim</c> patch tarball: </body> </section> - -<section> -<title>Adding Patches to the tree</title> -<body> - -<p> -When adding a patch to the tree be sure to check that the patch doesn't have -Git keywords in it that will be expanded (such as <c>$Id$</c>). If -the patch contains these, it will break manifests unless you add it to the tree -correctly. In the case that it does have the keywords, you should remove them. -Afterwards they can be added like every other file: -</p> - -<pre> -git add files/${P}-the-cool-patch.patch -</pre> - -</body> -</section> </body> </chapter> </guide> |