Re: To grok grep output....
Aaron Van Couwenberghe <aaron@awac.debian.org> writes:
> diff -u --recursive --new-file v2.2.11/linux/CREDITS linux/CREDITS
> --- v2.2.11/linux/CREDITS Mon Aug 9 16:05:54 1999
> +++ linux/CREDITS Wed Aug 25 17:29:45 1999
> @@ -689,14 +689,11 @@
The fourth line is made of two pairs, representing the old and new
files.
The first figure for each pair is the line number that starts the
hunk. The second figure is the number of lines addressed in the hunk.
So, based on the line you showed, I'd expect that you would have three
more minuses than plusses---hence the number of lines in the hunk went
from 14 to 11.
And going and looking at my copy of patch-2.2.12, I see that the
relevant hunk is:
S: USA
N: Paul Gortmaker
-E: gpg109@rsphy1.anu.edu.au
-W: http://rsphy1.anu.edu.au/~gpg109
-D: Real Time Clock driver author.
-D: 8390 net driver hacker (ne2000, wd8013, smc-ultra, 3c503, etc.)
-D: Ethernet-HOWTO and BootPrompt-HOWTO author.
-D: Added many new CONFIG options (modules, ramdisk, generic-serial, etc.)
-D: Implemented 1st "official" kernel thread (moved user bdflush to kflushd)
-D: Various other random hacks, patches and utilities.
+E: p_gortmaker@yahoo.com
+D: Author of RTC driver & several net drivers, Ethernet & BootPrompt Howto.
+D: Made support for modules, ramdisk, generic-serial, etc. optional.
+D: Transformed old user space bdflush into 1st kernel thread - kflushd.
+D: Many other patches, documentation files, mini kernels, utilities, ...
N: John E. Gotts
E: jgotts@engin.umich.edu
Which has eight lines deleted, and five added---in other words three
more lines were deleted than were added or unchanged.
If you look at the header for the second hunk in that file:
@@ -978,6 +975,16 @@
You'll see that it starts with line 978 in the original file, but 975
in the edited file, since three lines were removed in the prior hunk.
There's a certain amount of redundancy so that patch can do a lot of
consistency checking.
Mike.
Reply to: