lkml.org 
[lkml]   [2001]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Patch files
On Tue, Oct 02, 2001 at 02:25:12AM +1000, Anthony wrote:

> about the patch file so I might be able to understand how it works. Can
> anyone please explain (or point me to the relevant documentation) to me
> what the following lines mean?:
>
> --- linux/include/linux/pci_ids.h.netmos Sat Sep 8 09:44:43 2001
> +++ linux/include/linux/pci_ids.h Sat Sep 8 09:44:45 2001

This header tells you that the patch was generated by running:

diff -u linux/include/linux/pci_ids.h.netmos linux/include/linux/pci_ids.h

The original file is marked with --- and the new file is marked with +++

> @@ -1664,8 +1664,12 @@

This is used to seperate parts of the patch file. What it means exactly is
that the file position in the original file was at line 1664 and extended
for 8 lines, and in the new file its at line 1664 and extends for 12 lines.

> And this is from further down in the patch:
> @@ -2831,6 +2839,15 @@

Same as above. Lines 6 lines starting at 2831 in original file, and 15
lines starting at 2839 in the new file.

Hope this helps.

Thanks,

Jim
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:17    [W:0.037 / U:0.604 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site