WebKit Bugzilla
New
Browse
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
RESOLVED FIXED
136379
svn-{apply, unapply} fails to apply/unapply SVN 1.7 patch that adds new file with property change
https://bugs.webkit.org/show_bug.cgi?id=136379
Summary
svn-{apply, unapply} fails to apply/unapply SVN 1.7 patch that adds new file ...
Daniel Bates
Reported
2014-08-29 11:51:56 PDT
Created
attachment 237365
[details]
[Test Case] Patch that adds non-empty file with executable bit Assuming you have Subversion 1.7.4 (
r1295709
) installed, downloaded the example patch NonEmptyFileWithExecutableBit.patch to ~/Desktop/NonEmptyFileWithExecutableBit.patch, and are in a terminal session with the WebKit checkout directory as the current working direcotry, perform the following: 1. Run: Tools/Scripts/svn-apply ~/Desktop/NonEmptyFileWithExecutableBit.patch Notice that svn-apply fails with output that has the form: copper:WebKit dbates$ Tools/Scripts/svn-apply ~/Desktop/NonEmptyFileWithExecutableBit.patch Parsed 2 diffs from patch file(s). patching file NonEmptyFileWithExecutableBit.txt A NonEmptyFileWithExecutableBit.txt patch: **** Only garbage was found in the patch input. Calling "patch -p0" for file "NonEmptyFileWithExecutableBit.txt" returned status 2. Pass --force to ignore patch failures.
Attachments
[Test Case] Patch that adds non-empty file with executable bit
(685 bytes, patch)
2014-08-29 11:51 PDT
,
Daniel Bates
no flags
Details
Formatted Diff
Diff
Patch
(2.69 KB, patch)
2014-08-29 11:57 PDT
,
Daniel Bates
no flags
Details
Formatted Diff
Diff
View All
Add attachment
proposed patch, testcase, etc.
Daniel Bates
Comment 1
2014-08-29 11:57:17 PDT
Created
attachment 237367
[details]
Patch
David Kilzer (:ddkilzer)
Comment 2
2014-09-03 11:57:32 PDT
Comment on
attachment 237367
[details]
Patch r=me
Daniel Bates
Comment 3
2014-09-09 13:13:09 PDT
Comment on
attachment 237367
[details]
Patch Clearing flags on attachment: 237367 Committed
r173438
: <
http://trac.webkit.org/changeset/173438
>
Daniel Bates
Comment 4
2014-09-09 13:13:11 PDT
All reviewed patches have been landed. Closing bug.
Note
You need to
log in
before you can comment on or make changes to this bug.
Top of Page
Format For Printing
XML
Clone This Bug