patch #4 (rollup patch for testing)

Tomaž Borštnar tomaz.borstnar at over.net
Mon Jul 18 22:43:36 PDT 2005


Matthew Dillon wrote:
:Hunk #9 succeeded at 1064.
:patch: **** malformed patch at line 1046: @@ -1110,7 +1115,10 @@
:
    I tested the patch against a fresh checkout and it applied just
    fine.  I can only guess that your mail program may have munged the
    data ?
I also took text output from http://leaf.dragonflybsd.org/mailarchive/bugs/2005-07/msg00117.html and used it:

|Index: kern/uipc_socket.c
|===================================================================
|RCS file: /cvs/src/sys/kern/uipc_socket.c,v
|retrieving revision 1.35
|diff -u -r1.35 uipc_socket.c
|--- kern/uipc_socket.c 15 Jul 2005 17:54:47 -0000      1.35
|+++ kern/uipc_socket.c 17 Jul 2005 07:28:57 -0000
--------------------------
Patching file kern/uipc_socket.c using Plan A...
Hunk #1 succeeded at 792.
Hunk #2 succeeded at 826.
Hunk #3 succeeded at 848.
Hunk #4 succeeded at 868.
Hunk #5 succeeded at 887.
Hunk #6 succeeded at 941.
Hunk #7 succeeded at 998.
Hunk #8 succeeded at 1022.
Hunk #9 succeeded at 1064.
patch: **** malformed patch at line 1020: @@ -1110,7 +1115,10 @@
So the same...

Tomaž





More information about the Bugs mailing list