Advertisement
Guest User

gnemmi

a guest
Nov 19th, 2009
106
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.61 KB | None | 0 0
  1. [root@mgargoyle ~]# cd /usr/src/sys/dev/bge/ && patch -R < /root/pen/template/bge.patch
  2.  
  3. Hmm... Looks like a unified diff to me...
  4. The text leading up to this was:
  5. --------------------------
  6. |Index: sys/dev/bge/if_bgereg.h
  7. |===================================================================
  8. |--- sys/dev/bge/if_bgereg.h (revision 199499)
  9. |+++ sys/dev/bge/if_bgereg.h (working copy)
  10. --------------------------
  11. Patching file if_bgereg.h using Plan A...
  12. Unreversed (or previously applied) patch detected! Ignore -R? [y]
  13. Hunk #1 succeeded at 1712 (offset -20 lines).
  14. Hunk #2 succeeded at 1834 (offset -20 lines).
  15. Hmm... The next patch looks like a unified diff to me...
  16. The text leading up to this was:
  17. --------------------------
  18. |Index: sys/dev/bge/if_bge.c
  19. |===================================================================
  20. |--- sys/dev/bge/if_bge.c (revision 199499)
  21. |+++ sys/dev/bge/if_bge.c (working copy)
  22. --------------------------
  23. Patching file if_bge.c using Plan A...
  24. Hunk #1 succeeded at 1283 (offset -37 lines).
  25. Hunk #2 succeeded at 1503 (offset -37 lines).
  26. Hunk #3 succeeded at 2955 with fuzz 1 (offset -40 lines).
  27. Hunk #4 succeeded at 2968 (offset -37 lines).
  28. Hunk #5 succeeded at 3464 (offset -27 lines).
  29. Hunk #6 failed at 3892.
  30. Hunk #7 failed at 3919.
  31. Hunk #8 succeeded at 4128 (offset -53 lines).
  32. Hunk #9 failed at 4248.
  33. Hunk #10 succeeded at 4291 (offset -37 lines).
  34. Hunk #11 succeeded at 4294 (offset -53 lines).
  35. Hunk #12 succeeded at 4358 (offset -27 lines).
  36. Hunk #13 failed at 4425.
  37. 4 out of 13 hunks failed--saving rejects to if_bge.c.rej
  38. done
  39. [root@gargoyle /usr/src/sys/dev/bge]#
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement