Re: Git Patch fails to apply with Svn Patch

The original patch file I used is attached.

Thanks!

Eric

On Fri, May 2, 2014 at 4:05 AM, Stefan Sperling <stsp_at_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!
>