Bug 33534 - svn-apply fails to apply patches generated by git format-patch
Summary: svn-apply fails to apply patches generated by git format-patch
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC OS X 10.5
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-01-12 08:23 PST by Gustavo Noronha (kov)
Modified: 2011-04-09 20:35 PDT (History)
4 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Gustavo Noronha (kov) 2010-01-12 08:23:27 PST
One example is this one:

https://bugs.webkit.org/attachment.cgi?id=46364

When I try to use webkit-patch to apply it, I get the following error message:

Processing patch 46364 from bug 33015.
Failed to run "['/home/kov/src/WebKit/WebKitTools/Scripts/svn-apply']" exit_code: 9
Last 500 characters of output:
ess

---
 LayoutTests/ChangeLog                              |   14 ++++++++++++
 LayoutTests/media/audio-mpeg-supported.html        |   15 ++++++++++---
 LayoutTests/media/video-seek-past-end-playing.html |   22 ++++++++++++-------
 LayoutTests/platform/gtk/Skipped                   |    4 ---
 4 files changed, 39 insertions(+), 16 deletions(-)


-------------------------------------------------------------------
Died at /home/kov/src/WebKit/WebKitTools/Scripts/svn-apply line 336, <> line 141.

Failed to run "['/home/kov/src/WebKit/WebKitTools/Scripts/svn-apply']" exit_code: 9

I think it is caused by the fact that the header of the patch is too big for svn-apply.
Comment 1 Chris Jerdonek 2010-05-04 08:35:10 PDT
(In reply to comment #0)
> When I try to use webkit-patch to apply it, I get the following error message:

Hi Gustavo, can you verify whether this report is still an issue following this fix?

https://bugs.webkit.org/show_bug.cgi?id=38507

Prior to the fix above, I believe the sample patch you provided would have worked only using "svn-apply --force".  But since webkit-patch evidently used "svn-apply" without --force:

> Processing patch 46364 from bug 33015.
> Failed to run "['/home/kov/src/WebKit/WebKitTools/Scripts/svn-apply']"

that may explain why it was failing before.

(Now the patch should apply even without using the --force option.)
Comment 2 David Levin 2011-04-09 20:35:43 PDT
I think this has been fixed. If not please feel free to re-open, so it can be investigated.