ahh, sorry, after the roll back didn't apply all those patches.
Next time you don't need to send the file. If you do any modification, you can do a "svn diff" and it will tell only the differences, that would be enought. Something like:
$ svn diff > my-x-fix.patch
send me the patch file and is enough.