[gentoo-commits] proj/devmanual:master commit in: tools-reference/diff-and-patch/

[gentoo-commits] proj/devmanual:master commit in: tools-reference/diff-and-patch/

[Ulrich Müller]

commit:     6d4d7bf4a36fa3ff6bafda0ca0cef519c2663015
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 07:59:09 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 30 11:22:42 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=6d4d7bf4

tools-reference/diff-and-patch/: add a link to "clean patches" page

 - add a text link from tools-reference/diff-and-patch/index.html to
   ebuild-writing/misc-files/patches

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 tools-reference/diff-and-patch/text.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools-reference/diff-and-patch/text.xml b/tools-reference/diff-and-patch/text.xml
index 8a6172d..3be24db 100644
--- a/tools-reference/diff-and-patch/text.xml
+++ b/tools-reference/diff-and-patch/text.xml
@@ -30,7 +30,8 @@ format. This is generally the best format to use when sending patches
 upstream too <d/> however, occasionally you may be asked to provide
 context diffs, which are more portable than unifieds (but don't handle
 conflicts as cleanly). In this case, use <c>-c</c> rather
-than <c>-u</c>.
+than <c>-u</c>. For a verbose guide into patches and patching, see
+<uri link="::ebuild-writing/misc-files/patches"/>.
 </p>
 
 <p>

[gentoo-commits] proj/devmanual:master commit in: tools-reference/diff-and-patch/

[Ulrich Müller]

commit:     a1f06105dca95202204caa1c4ec931e28cd6793d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 19:14:05 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 08:35:43 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a1f06105

tools-reference/diff-and-patch: No longer mention epatch

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 tools-reference/diff-and-patch/text.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools-reference/diff-and-patch/text.xml b/tools-reference/diff-and-patch/text.xml
index 0e9755c..939e01e 100644
--- a/tools-reference/diff-and-patch/text.xml
+++ b/tools-reference/diff-and-patch/text.xml
@@ -38,8 +38,7 @@ than <c>-u</c>. For a verbose guide into patches and patching, see
 To apply a patch, use <c>patch -pX &lt; whatever.patch</c>,
 where <c>X</c> is a number representing the number of path components
 which must be removed (typically this is <c>0</c> or <c>1</c>). Within
-ebuilds, use the <c>epatch</c> function, or <c>eapply</c> function
-beginning with EAPI=6, instead — see
+ebuilds, use the <c>eapply</c> function instead <d/> see
 <uri link="::ebuild-writing/functions/src_prepare/epatch/"/>.
 </p>
 

[gentoo-commits] proj/devmanual:master commit in: tools-reference/diff-and-patch/

[Ulrich Müller]

commit:     99b3768a5a41c74b74106c08cb93a54a731eeff2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 21:10:54 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 22:02:56 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=99b3768a

tools-reference/diff-and-patch: use name(section) notation for man pages

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 tools-reference/diff-and-patch/text.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools-reference/diff-and-patch/text.xml b/tools-reference/diff-and-patch/text.xml
index dcbbf18..8a6172d 100644
--- a/tools-reference/diff-and-patch/text.xml
+++ b/tools-reference/diff-and-patch/text.xml
@@ -43,7 +43,7 @@ beginning with EAPI=6, instead — see
 </p>
 
 <p>
-The diff-1 and patch-1 manual pages provide more information.
+The <c>diff(1)</c> and <c>patch(1)</c> manual pages provide more information.
 </p>
 
 </body>

[gentoo-commits] proj/devmanual:master commit in: tools-reference/diff-and-patch/

[Brian Evans]

commit:     f9fa8b3c19cb83e0ae12f18175c0d218fb30f343
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 18:09:00 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 18:09:00 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=f9fa8b3c

Mention eapply in diff and patch tools section

Closes: https://bugs.gentoo.org/652472
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 tools-reference/diff-and-patch/text.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools-reference/diff-and-patch/text.xml b/tools-reference/diff-and-patch/text.xml
index 0b3fd9c..01f1ad0 100644
--- a/tools-reference/diff-and-patch/text.xml
+++ b/tools-reference/diff-and-patch/text.xml
@@ -37,7 +37,8 @@ than <c>-u</c>.
 To apply a patch, use <c>patch -pX &lt; whatever.patch</c>,
 where <c>X</c> is a number representing the number of path components
 which must be removed (typically this is <c>0</c> or <c>1</c>). Within
-ebuilds, use the <c>epatch</c> function instead — see
+ebuilds, use the <c>epatch</c> function, or <c>eapply</c> function
+beginning with EAPI=6, instead — see
 <uri link="::ebuild-writing/functions/src_prepare/epatch"/>.
 </p>
 

[gentoo-commits] proj/devmanual:master commit in: tools-reference/diff-and-patch/

[Justin Lecher]

commit:     b42bfa02b6dd35a3de9d0d8ec83e364e2ff5b06f
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 09:30:16 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 09:30:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=b42bfa02

Diff and patch update

Adding git, when it was written cvs and svn were realy popular.

 tools-reference/diff-and-patch/text.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools-reference/diff-and-patch/text.xml b/tools-reference/diff-and-patch/text.xml
index 1ea3bac..0b3fd9c 100644
--- a/tools-reference/diff-and-patch/text.xml
+++ b/tools-reference/diff-and-patch/text.xml
@@ -19,8 +19,9 @@ and <c>newfile</c>. To operate over directories instead, use <c>diff
 </p>
 
 <note>
-<c>cvs</c> and <c>svn</c> provide <c>cvs diff</c> and <c>svn diff</c>
-respectively which may be more helpful.
+VCS like <c>git</c>,<c>svn</c> or <c>cvs</c> provide built-in diff
+functionality (<c>git diff</c>, <c>svn diff</c>, <c>cvs diff</c>)
+which may be more helpful.
 </note>
 
 <p>