hacki is right, we cannot use your patch. i wonder how you managed to create these conflicts.
please do exactly like i described the procedure, it will be the best for all of us, plus you learn how to handle svn & the stuff (took me a long time to learn it, but i know it's worth it).
checkout a fresh trunk. then apply your changes (not via diff, but by hand). then after you applied your changes and checked if you can still compile, you can create the diff/patch. and since this is a patch, you dont need to comment all changes with "//timestamp" or the like, because it will be marked in the revision history of the svn server.