popsuty `patch`

[Jakub Bogusz]

On Fri, Jan 14, 2005 at 09:54:30PM +0100, Paweł Sikora wrote:
> mam taka oto latke (test.patch)...
> 
> --- sched.h     2004-12-24 16:33:59 -0500
> +++ sched.h     2005-01-12 21:06:27 -0500
> @@ -664,6 +689,23 @@ struct task_struct {
>         struct mempolicy *mempolicy;
>         short il_next;          /* could be shared with used_math */
>  #endif
> +
[...]
> +#endif
>  };
> 
>  static inline pid_t process_group(struct task_struct *tsk)
> 
> 
> naklada ja sobie...
> 
> # patch -p0 < test.patch
> patching file sched.h
> Hunk #1 succeeded at 484 with fuzz 2 (offset -205 lines).
> 
> o jaki ladny fuzz. zrobmy zatem diffa...
> 
> # diff -u sched.h{.orig,}
> 
> --- sched.h.orig        2005-01-14 21:37:50.000000000 +0100
> +++ sched.h     2005-01-14 21:50:47.548627208 +0100
> @@ -459,6 +459,23 @@
>         unsigned long ttwu_wake_affine;
>         unsigned long ttwu_wake_balance;
>  #endif
> +
[...]
> +#endif
>  };
> 
>  #ifdef ARCH_HAS_SCHED_DOMAIN
> 
> 
> ooo, latka wyladowala w kosmosie.
> zupelnie INNY kontekst, a patch sobie ladnie chyba
> ze szklanej kuli wyczytal ze ona akurat tu spasuje.

man patch
/fuzz

Jest fuzz 2 (maksymalny domyślnie dopuszczalny), wszystko się zgadza.


-- 
Jakub Bogusz    http://cyber.cs.net.pl/~qboosh/