| 1 |
commit: 7d8a3d00c1975646d21a84496aecc57bcefd7b1a |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 26 16:49:40 2017 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 28 21:41:03 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=7d8a3d00 |
| 7 |
|
| 8 |
ebuild-writing: Delete obsolete sections about CVS keyword expansion. |
| 9 |
|
| 10 |
Git doesn't by default expand any keywords like $Id$ or $Date$, so |
| 11 |
patches can be committed like any other file. |
| 12 |
|
| 13 |
ebuild-writing/functions/src_prepare/epatch/text.xml | 14 -------------- |
| 14 |
ebuild-writing/misc-files/patches/text.xml | 19 ------------------- |
| 15 |
2 files changed, 33 deletions(-) |
| 16 |
|
| 17 |
diff --git a/ebuild-writing/functions/src_prepare/epatch/text.xml b/ebuild-writing/functions/src_prepare/epatch/text.xml |
| 18 |
index 6cdff0d..b873661 100644 |
| 19 |
--- a/ebuild-writing/functions/src_prepare/epatch/text.xml |
| 20 |
+++ b/ebuild-writing/functions/src_prepare/epatch/text.xml |
| 21 |
@@ -67,20 +67,6 @@ src_prepare() { |
| 22 |
Remember to add the patch to <c>SRC_URI</c>. |
| 23 |
</p> |
| 24 |
</body> |
| 25 |
- |
| 26 |
-<subsection> |
| 27 |
-<title>Git Keyword Expansion Lines and Patches</title> |
| 28 |
-<body> |
| 29 |
-<p> |
| 30 |
-If your patch includes any changes to Git <c>$Id$</c> |
| 31 |
-(or <c>$Date$</c>) lines, it cannot be |
| 32 |
-distributed under <c>files/</c>, since Git will clobber the patch when |
| 33 |
-keywords are expanded on the staging box. In these situations, either remove this hunk of the patch |
| 34 |
-manually, or mirror the file. See <uri link="::general-concepts/git-to-rsync"/>. |
| 35 |
-</p> |
| 36 |
-</body> |
| 37 |
-</subsection> |
| 38 |
- |
| 39 |
</section> |
| 40 |
|
| 41 |
<section> |
| 42 |
|
| 43 |
diff --git a/ebuild-writing/misc-files/patches/text.xml b/ebuild-writing/misc-files/patches/text.xml |
| 44 |
index f0b1f13..506871f 100644 |
| 45 |
--- a/ebuild-writing/misc-files/patches/text.xml |
| 46 |
+++ b/ebuild-writing/misc-files/patches/text.xml |
| 47 |
@@ -101,25 +101,6 @@ from the <c>vim</c> patch tarball: |
| 48 |
|
| 49 |
</body> |
| 50 |
</section> |
| 51 |
- |
| 52 |
-<section> |
| 53 |
-<title>Adding Patches to the tree</title> |
| 54 |
-<body> |
| 55 |
- |
| 56 |
-<p> |
| 57 |
-When adding a patch to the tree be sure to check that the patch doesn't have |
| 58 |
-Git keywords in it that will be expanded (such as <c>$Id$</c>). If |
| 59 |
-the patch contains these, it will break manifests unless you add it to the tree |
| 60 |
-correctly. In the case that it does have the keywords, you should remove them. |
| 61 |
-Afterwards they can be added like every other file: |
| 62 |
-</p> |
| 63 |
- |
| 64 |
-<pre> |
| 65 |
-git add files/${P}-the-cool-patch.patch |
| 66 |
-</pre> |
| 67 |
- |
| 68 |
-</body> |
| 69 |
-</section> |
| 70 |
</body> |
| 71 |
</chapter> |
| 72 |
</guide> |
Archives