<html>
<head>
<style><!--
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
font-size: 12pt;
font-family:Calibri
}
--></style></head>
<body class='hmmessage'><div dir='ltr'>Hi,<br><br>I thought rich text formatting was causing this, but plain text didn't help.<br>I resubmitted using git send email.<br><br>M<br><br><div>> Subject: Re: [PATCH 1/2] reg: simplify root key search<br>> To: wine-devel@winehq.org; xantares09@hotmail.com<br>> From: stefandoesinger@gmail.com<br>> Date: Thu, 3 Sep 2015 11:57:09 +0200<br>> <br>> -----BEGIN PGP SIGNED MESSAGE-----<br>> Hash: SHA1<br>> <br>> Hi,<br>> <br>> This patch still fails to apply with the same error:<br>> <br>> stefan@retina ~/src/wine $ git am /dev/shm/\[PATCH\ 1_2\]\ reg\:\<br>> simplify\ root\ key\ search.eml<br>> Applying: reg: simplify root key search<br>> /home/stefan/src/wine/.git/rebase-apply/patch:14: trailing whitespace.<br>> static const WCHAR short_hklm[] = {'H','K','L','M',0};<br>> /home/stefan/src/wine/.git/rebase-apply/patch:15: trailing whitespace.<br>> static const WCHAR short_hkcu[] = {'H','K','C','U',0};<br>> /home/stefan/src/wine/.git/rebase-apply/patch:16: trailing whitespace.<br>> static const WCHAR short_hkcr[] = {'H','K','C','R',0};<br>> /home/stefan/src/wine/.git/rebase-apply/patch:17: trailing whitespace.<br>> static const WCHAR short_hku[] = {'H','K','U',0};<br>> /home/stefan/src/wine/.git/rebase-apply/patch:18: trailing whitespace.<br>> static const WCHAR short_hkcc[] = {'H','K','C','C',0};<br>> error: patch failed: programs/reg/reg.c:22<br>> error: programs/reg/reg.c: patch does not apply<br>> Patch failed at 0001 reg: simplify root key search<br>> The copy of the patch that failed is found in:<br>> /home/stefan/src/wine/.git/rebase-apply/patch<br>> When you have resolved this problem, run "git am --continue".<br>> If you prefer to skip this patch, run "git am --skip" instead.<br>> To restore the original branch and stop patching, run "git am --abort".<br>> <br>> Stefan<br>> Am 2015-08-31 um 22:09 schrieb Michel Zou:<br>> > Split patch from Jonathan Vollebregt: <br>> > https://github.com/jnvsor/wine/commit/ea0e2fc70db6ce4904655ea4a27ee34531d96712<br>> ><br>> > <br>> - ---<br>> > programs/reg/reg.c | 85<br>> > +++++++++++++++++++++++++++--------------------------- 1 file<br>> > changed, 43 insertions(+), 42 deletions(-)<br>> > <br>> > <br>> > <br>> > <br>> > <br>> > <br>> <br>> -----BEGIN PGP SIGNATURE-----<br>> Version: GnuPG v2<br>> <br>> iQIcBAEBAgAGBQJV6Bl1AAoJEN0/YqbEcdMwf+sQAI7u19WiDrPOtniTS00sJZeS<br>> mrBSZHvhKlDujZ4iCr4VHyycBzhCmg8peflfgEHRyF9xGx6duy/mzh0JHN3qJFlM<br>> r7zbm9wbhFCaH7i4d1JD2a7l9hthow+N3PuPKWk5ox+T+Pe9HaXTQwxUmgB/6YjR<br>> xXjkHDEc5GtyBeqxpiskw2W92GWubrMrEJmfmlQQSWfcIZjkUM0MmKCEUCibMu3O<br>> bLPOsx1AjD3aQ+S0R50D3s1W1u/yO0tfKa0pGki2pqZRL/72UcbBWNow6F9tZIeD<br>> qXaAgNhvn0rc66nMVb7yc//9nN4oN2prBNtrpCtSCCfSgd/Xh47xoq8g3HQUXjHd<br>> nNbfSuePuNLvNzu5XhNb0yP5cGCZedU8q7cYcPURn376t25xw22daigpdId3kaS0<br>> KN+gwb2M1PSazPwkjRy94qIX9Kl0NIsJT8dLHZgV0TM7ZrRBy0sa2baqH5jvL+4h<br>> pCn9+Kcuyv5jC7Oj/ewNx+9EIRmUf7wOJvgdNocUqwSyHPf7bJwZOysAm4ltk8pq<br>> A7RA2qiyicANi34Yf1e8zKG1Fv1M/uYwvjc3Sd8jrTpkn0z9mzijll4R+bcThAXA<br>> jdZjA3HTyvoaaENxmKJngb7Xz2o0WBV1WUEjIIUos+md8IV7bCnH0dbCDtE3AQKl<br>> u/eABCeasbpTQJ61px7N<br>> =V5u2<br>> -----END PGP SIGNATURE-----<br></div> </div></body>
</html>