Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (nike.apache.org: domain of ericmberge@gmail.com designates
 209.85.216.49 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <20140502090557.GJ19005@ted.stsp.name>
References: 
 <CALFumAh=7Y7HJBOOXmpGkvPkAA8nY9pmrxPh81rA8Pjh1koLwQ@mail.gmail.com>
	<20140502090557.GJ19005@ted.stsp.name>
Date: Fri, 2 May 2014 14:06:46 -0500
Message-ID: 
 <CALFumAihkXtpCZrxRCqGBGinUGa=mEqifto_mgodM18-9eCRYQ@mail.gmail.com>
Subject: Re: Git Patch fails to apply with Svn Patch
From: Eric Berge <ericmberge@gmail.com>
To: Eric Berge <ericmberge@gmail.com>, users@subversion.apache.org
Content-Type: multipart/mixed; boundary=089e0149512ca5766804f86f7b46

--089e0149512ca5766804f86f7b46
Content-Type: multipart/alternative; boundary=089e0149512ca5766404f86f7b44

--089e0149512ca5766404f86f7b44
Content-Type: text/plain; charset=UTF-8

The original patch file I used is attached.

Thanks!

Eric


On Fri, May 2, 2014 at 4:05 AM, Stefan Sperling <stsp@elego.de> wrote:

> On Thu, May 01, 2014 at 02:30:33PM -0500, Eric Berge wrote:
> > I was running "svn patch" with a patch I created with "git diff" and it
> > failed to apply, however it applies just fine with the default "patch"
> > command on my Rhel 6.5 system.
> >
> > This is due to the "extended header" information that git puts before the
> > actual diff in some cases.  I validated this by removing the lines
> > beginning with "old mode" and "new mode" in the patch below (file
> "PATCH2")
> > and then "svn patch" applied the patch successfully.
>
> Hi Eric,
>
> can you please re-send the patch which failed to apply as an attachment?
> It seem your mailer mangled the patch. The patch format is whitespace
> sensitive, unfortunately (e.g. tabs vs. spaces matter).
>
> Thanks!
>

--089e0149512ca5766404f86f7b44
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">The original patch file I used is attached.<div><br></div>=
<div>Thanks!</div><div><br></div><div>Eric</div><div><br></div></div><div c=
lass=3D"gmail_extra"><br><br><div class=3D"gmail_quote">On Fri, May 2, 2014=
 at 4:05 AM, Stefan Sperling <span dir=3D"ltr">&lt;<a href=3D"mailto:stsp@e=
lego.de" target=3D"_blank">stsp@elego.de</a>&gt;</span> wrote:<br>
<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
x #ccc solid;padding-left:1ex"><div class=3D"">On Thu, May 01, 2014 at 02:3=
0:33PM -0500, Eric Berge wrote:<br>
&gt; I was running &quot;svn patch&quot; with a patch I created with &quot;=
git diff&quot; and it<br>
&gt; failed to apply, however it applies just fine with the default &quot;p=
atch&quot;<br>
&gt; command on my Rhel 6.5 system.<br>
&gt;<br>
&gt; This is due to the &quot;extended header&quot; information that git pu=
ts before the<br>
&gt; actual diff in some cases. =C2=A0I validated this by removing the line=
s<br>
&gt; beginning with &quot;old mode&quot; and &quot;new mode&quot; in the pa=
tch below (file &quot;PATCH2&quot;)<br>
&gt; and then &quot;svn patch&quot; applied the patch successfully.<br>
<br>
</div>Hi Eric,<br>
<br>
can you please re-send the patch which failed to apply as an attachment?<br=
>
It seem your mailer mangled the patch. The patch format is whitespace<br>
sensitive, unfortunately (e.g. tabs vs. spaces matter).<br>
<br>
Thanks!<br>
</blockquote></div><br></div>

--089e0149512ca5766404f86f7b44--

--089e0149512ca5766804f86f7b46
Content-Type: application/octet-stream; name=PATCH2
Content-Disposition: attachment; filename=PATCH2
Content-Transfer-Encoding: base64
X-Attachment-Id: f_hupuqt1l0

ZGlmZiAtLWdpdCBhL01ha2VmaWxlIGIvTWFrZWZpbGUKb2xkIG1vZGUgMTAwNjQ0Cm5ldyBtb2Rl
IDEwMDc1NQppbmRleCBjYWVmMGE1Li4zMTBlOGU5Ci0tLSBhL01ha2VmaWxlCisrKyBiL01ha2Vm
aWxlCkBAIC01LDYgKzUsNyBAQCBleHBvcnQgQlVJTERfU1lTX1JPT1QKIGV4cG9ydCBCVUlMRF9U
QVJHRVRfUk9PVAogZXhwb3J0IEJVSUxEX0RJUgogZXhwb3J0IENNQUtFX1BBU1NUSFJPVUdIX0FS
R1MKK2V4cG9ydCBBRERfRkFLRV9WQVJJQUJMRQogZXhwb3J0IERFU1RESVIKIGV4cG9ydCBESVNU
UEtHX0xPQwogZXhwb3J0IFdJVEhfTU9WRVIK
--089e0149512ca5766804f86f7b46--