Re: I confused about diff(simple question)

[Willy Tarreau <willy@w.ods.org>]

On Sun, Jul 10, 2005 at 01:41:40PM +0800, guorke wrote:
> like:
> 
>  /*
> @@ -220,9 +232,8(HERE: why not -220,9 +220,8) @@ fastcall notrace void
> do_page_fault(stru
>        struct vm_area_struct * vma;
>        unsigned long address;
>        unsigned long page;
> -       int write;
> -       siginfo_t info;
> -
> +       int write, si_code;
> +

(...) 
>  I think the old file from the line 220,and have 9 lines,then the
> newfile have 8 lines
> so must delete one line. but why +232,it from the line 232 ?
> like this..

because there was another chunk before this one, which added 12 lines,
so the offset in the old file is 220, and the offset in the new file is
232 because of the previous chunk.

Willy

-
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/