Bug 60848 - svn-{apply, unapply} can't handle Git diff that only changes executable bit
Summary: svn-{apply, unapply} can't handle Git diff that only changes executable bit
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Normal
Assignee: Daniel Bates
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-14 15:44 PDT by Daniel Bates
Modified: 2011-05-15 16:55 PDT (History)
4 users (show)

See Also:


Attachments
Patch and unit tests (14.19 KB, patch)
2011-05-14 15:47 PDT, Daniel Bates
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Daniel Bates 2011-05-14 15:44:20 PDT
The patch <https://bugs.webkit.org/attachment.cgi?id=90852> failed to apply since it contains a diff that only changes the executable bit of a file, Tools/Scripts/run-gtk-tests.

svn-{apply, unapply} can handle the SVN equivalent of this, an SVN property change diff for a file that only has property changes, since it follows naturally from the presence of an SVN property change header (because property changes are separated from content changes in an SVN patch). Git outputs one diff header per file that may include, among other things, file mode information; content changes; or both. We should teach svn-{apply, unapply} how to handle a diff that only changes the executable bit of a file.
Comment 1 Daniel Bates 2011-05-14 15:47:52 PDT
Created attachment 93572 [details]
Patch and unit tests
Comment 2 Daniel Bates 2011-05-15 16:55:16 PDT
Committed r86515: <http://trac.webkit.org/changeset/86515>