[bootlin/training-materials updates] master: Details about patches (5e9a56dc)

Michael Opdenacker michael.opdenacker at bootlin.com
Wed May 27 12:21:15 CEST 2020


Repository : https://github.com/bootlin/training-materials
On branch  : master
Link       : https://github.com/bootlin/training-materials/commit/5e9a56dce915f73fcdac8d911835f055a85f2cd6

>---------------------------------------------------------------

commit 5e9a56dce915f73fcdac8d911835f055a85f2cd6
Author: Michael Opdenacker <michael.opdenacker at bootlin.com>
Date:   Wed May 27 12:21:15 2020 +0200

    Details about patches
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at bootlin.com>


>---------------------------------------------------------------

5e9a56dce915f73fcdac8d911835f055a85f2cd6
 .../sysdev-linux-tarballs-and-patches.tex              | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/slides/sysdev-linux-tarballs-and-patches/sysdev-linux-tarballs-and-patches.tex b/slides/sysdev-linux-tarballs-and-patches/sysdev-linux-tarballs-and-patches.tex
index 7b0ad14c..ed27fa20 100644
--- a/slides/sysdev-linux-tarballs-and-patches/sysdev-linux-tarballs-and-patches.tex
+++ b/slides/sysdev-linux-tarballs-and-patches/sysdev-linux-tarballs-and-patches.tex
@@ -36,7 +36,8 @@
     \item Computed with the \code{diff} tool, or with more elaborate
       version control systems
     \end{itemize}
-  \item They are very common in the open-source community
+  \item They are very common in the open-source community.\\
+        See \url{https://en.wikipedia.org/wiki/Diff}
   \item Excerpt from a patch:
   \end{itemize}
 \footnotesize
@@ -58,6 +59,7 @@ diff -Nru a/Makefile b/Makefile
 
 \begin{frame}[fragile]
   \frametitle{Contents of a patch}
+\small
   \begin{itemize}
   \item One section per modified file, starting with a header
 \scriptsize
@@ -66,14 +68,15 @@ diff -Nru a/Makefile b/Makefile
 --- a/Makefile 2005-03-04 09:27:15 -08:00
 +++ b/Makefile 2005-03-04 09:27:15 -08:00
 \end{verbatim}
-\normalsize
-  \item One sub-section per modified part of the file, starting with
-    header with the affected line numbers
+\small
+  \item One sub-section ({\em hunk}) per modified part of the file, starting with
+    a header with the starting line number and the number of lines the
+    change hunk applies to
 \scriptsize
 \begin{verbatim}
 @@ -1,7 +1,7 @@
 \end{verbatim}
-\normalsize
+\small
   \item Three lines of context before the change
 \scriptsize
 \begin{verbatim}
@@ -81,14 +84,14 @@ diff -Nru a/Makefile b/Makefile
  PATCHLEVEL = 6
  SUBLEVEL = 11
 \end{verbatim}
-\normalsize
+\small
   \item The change itself
 \scriptsize
 \begin{verbatim}
 -EXTRAVERSION =
 +EXTRAVERSION = .1
 \end{verbatim}
-\normalsize
+\small
     \item Three lines of context after the change
 \scriptsize
 \begin{verbatim}
@@ -96,7 +99,6 @@ diff -Nru a/Makefile b/Makefile
 
  # *DOCUMENTATION*
 \end{verbatim}
-\normalsize
     \end{itemize}
 \end{frame}
 




More information about the training-materials-updates mailing list