Well, simply, I tried to apply the patch, and 3 different "hunks" failed... Now, I saw the tips about how to fix it manually, but I didn't really understand what I needed to do, so if anyone can give me some pointers it would be greatly appreciated. Also, here's the output from the patch... maybe someone knows a quick fix for my particualr problem.... Thanks, Josh -jburley@uci.edu- jburley@pulse% patch < obj_mail.diff ~/circle/src Hmm... Looks like a new-style context diff to me... The text leading up to this was: -------------------------- |diff -c stock_src/mail.c src/mail.c |*** stock_src/mail.c Mon Dec 16 05:19:56 1996 |--- src/mail.c Mon Dec 16 13:38:28 1996 -------------------------- Patching file mail.c using Plan A... Hunk #1 succeeded at 212. Hunk #2 succeeded at 233. Hunk #3 succeeded at 306. Hunk #4 succeeded at 367. Hunk #5 succeeded at 442. Hunk #6 failed at 455. Hunk #7 succeeded at 520. Hunk #8 succeeded at 540. 1 out of 8 hunks failed--saving rejects to mail.c.rej Hmm... The next patch looks like a new-style context diff to me... The text leading up to this was: -------------------------- |diff -c stock_src/mail.h src/mail.h |*** stock_src/mail.h Mon Dec 16 05:19:56 1996 |--- src/mail.h Mon Dec 16 13:20:32 1996 -------------------------- Patching file mail.h using Plan A... Hunk #1 succeeded at 46. Hunk #2 succeeded at 64. Hmm... The next patch looks like a new-style context diff to me... The text leading up to this was: -------------------------- |diff -c stock_src/modify.c src/modify.c |*** stock_src/modify.c Mon Dec 16 05:19:56 1996 |--- src/modify.c Mon Dec 16 13:21:48 1996 -------------------------- Patching file modify.c using Plan A... Hunk #1 failed at 90. 1 out of 1 hunks failed--saving rejects to modify.c.rej Hmm... The next patch looks like a new-style context diff to me... The text leading up to this was: -------------------------- |diff -c stock_src/structs.h src/structs.h |*** stock_src/structs.h Mon Dec 16 11:51:27 1996 |--- src/structs.h Mon Dec 16 13:09:34 1996 -------------------------- Patching file structs.h using Plan A... Hunk #1 succeeded at 932 with fuzz 1 (offset 44 lines). Hmm... Ignoring the trailing garbage. done ------------------------------------------------------------------------------ Joshua Burley "It's all fun and games until someone loses an eye, jburley@uci.edu then it becomes a scavenger hunt." ------------------------------------------------------------------------------ +-----------------------------------------------------------+ | Ensure that you have read the CircleMUD Mailing List FAQ: | | http://cspo.queensu.ca/~fletcher/Circle/list_faq.html | +-----------------------------------------------------------+
This archive was generated by hypermail 2b30 : 12/18/00 PST