On 07/06/2010 08:40 PM, Ken Sharp wrote:
Could someone take a look at this for me?
http://source.winehq.org/patches/data/63232
It applies fine here but http://source.winehq.org/patches/ says it fails. I can't see what's wrong. :(
How did you test it? The way to go is: - Save the email from the email client (thunderbird here) - The git am that email: $ git am /tmp/kernel32:\ Update\ Welsh\ resource\ (try3).eml Applying: kernel32: Update Welsh resource fatal: patch with only garbage at line 7 Patch failed at 0001 kernel32: Update Welsh resource When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort".
Found it: you have an empty line after the diff header --- a/dlls/kernel32/nls/cym.nls +++ b/dlls/kernel32/nls/cym.nls
@@ -130,28 +130,28 @@ STRINGTABLE LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
Removing that line makes the patch apply.
bye michael