Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S273516AbRJBMj3>; Tue, 2 Oct 2001 08:39:29 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S273204AbRJBMjT>; Tue, 2 Oct 2001 08:39:19 -0400
Received: from mail.intrex.net ([209.42.192.246]:21008 "EHLO intrex.net")
	by vger.kernel.org with ESMTP id <S273065AbRJBMjJ>;
	Tue, 2 Oct 2001 08:39:09 -0400
Date: Tue, 2 Oct 2001 08:42:10 -0400
From: jlnance@intrex.net
To: Anthony <aslan@ispdr.net.au>, linux-kernel@vger.kernel.org
Subject: Re: Patch files
Message-ID: <20011002084210.A1333@bessie.localdomain>
In-Reply-To: <4.3.2.7.2.20011002021641.02340710@mail.ispdr.net.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <4.3.2.7.2.20011002021641.02340710@mail.ispdr.net.au>; from aslan@ispdr.net.au on Tue, Oct 02, 2001 at 02:25:12AM +1000
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

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/