[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Git Patch fails to apply with Svn Patch

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 2 May 2014 11:05:58 +0200

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!
Received on 2014-05-02 11:06:52 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.