136379 2014-08-29 11:51:56 -0700 svn-{apply, unapply} fails to apply/unapply SVN 1.7 patch that adds new file with property change 2014-09-09 13:13:11 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates dbates ddkilzer oldest_to_newest 1032217 0 237365 dbates 2014-08-29 11:51:56 -0700 Created attachment 237365 [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. 1032219 1 237367 dbates 2014-08-29 11:57:17 -0700 Created attachment 237367 Patch 1032961 2 237367 ddkilzer 2014-09-03 11:57:32 -0700 Comment on attachment 237367 Patch r=me 1034148 3 237367 dbates 2014-09-09 13:13:09 -0700 Comment on attachment 237367 Patch Clearing flags on attachment: 237367 Committed r173438: <http://trac.webkit.org/changeset/173438> 1034149 4 dbates 2014-09-09 13:13:11 -0700 All reviewed patches have been landed. Closing bug. 237365 2014-08-29 11:51:56 -0700 2014-08-29 11:51:56 -0700 [Test Case] Patch that adds non-empty file with executable bit NonEmptyFileWithExecutableBit.patch text/plain 685 dbates SW5kZXg6IE5vbkVtcHR5RmlsZVdpdGhFeGVjdXRhYmxlQml0LnR4dAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBO b25FbXB0eUZpbGVXaXRoRXhlY3V0YWJsZUJpdC50eHQJKHJldmlzaW9uIDApCisrKyBOb25FbXB0 eUZpbGVXaXRoRXhlY3V0YWJsZUJpdC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSBAQAor VGhpcyBpcyBhIG5vbi1lbXB0eSBmaWxlIHdpdGggYW4gZXhlY3V0YWJsZSBiaXQuCkluZGV4OiBO b25FbXB0eUZpbGVXaXRoRXhlY3V0YWJsZUJpdC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTm9uRW1wdHlG aWxlV2l0aEV4ZWN1dGFibGVCaXQudHh0CShyZXZpc2lvbiAwKQorKysgTm9uRW1wdHlGaWxlV2l0 aEV4ZWN1dGFibGVCaXQudHh0CSh3b3JraW5nIGNvcHkpCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBO b25FbXB0eUZpbGVXaXRoRXhlY3V0YWJsZUJpdC50eHQKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRlZDogc3ZuOmV4 ZWN1dGFibGUKIyMgLTAsMCArMSAjIworKgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5 Cg== 237367 2014-08-29 11:57:17 -0700 2014-09-09 13:13:08 -0700 Patch Bug136379.patch text/plain 2753 dbates SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3MzExNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE0LTA4LTI5ICBEYW5pZWwgQmF0ZXMgIDxkYmF0ZXNAd2Via2l0Lm9yZz4K KworICAgICAgICBzdm4te2FwcGx5LCB1bmFwcGx5fSBmYWlscyB0byBhcHBseS91bmFwcGx5IFNW TiAxLjcgcGF0Y2ggdGhhdCBhZGRzIG5ldyBmaWxlIHdpdGggcHJvcGVydHkgY2hhbmdlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYzNzkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhlcyBhbiBpc3N1 ZSB3aGVyZSBzdm4te2FwcGx5LCB1bmFwcGx5fSBmYWlsIHRvIGFwcGx5IG9yIHVuYXBwbHksIHJl c3BlY3RpdmVseSwKKyAgICAgICAgYSBwYXRjaCBnZW5lcmF0ZWQgdXNpbmcgU3VidmVyc2lvbiAx LjcuNCAocjEyOTU3MDkpIHRoYXQgYm90aCBhZGRzIGEgbmV3IGZpbGUgRgorICAgICAgICBhbmQg c2V0cyBhIHByb3BlcnR5IG9uIEYgKHNheSwgdGhlIGV4ZWN1dGFibGUgYml0KS4KKworICAgICAg ICAqIFNjcmlwdHMvc3ZuLWFwcGx5OgorICAgICAgICAocGF0Y2gpOiBPbmx5IGFkZCBmaWxlIGlm IHRoZSBkaWZmIGhhcyB0ZXh0IGNodW5rcy4KKyAgICAgICAgKiBTY3JpcHRzL3N2bi11bmFwcGx5 OgorICAgICAgICAocGF0Y2gpOiBPbmx5IGRlbGV0ZSBhZGRlZCBmaWxlIGlmIHRoZSBkaWZmIGhh cyB0ZXh0IGNodW5rcy4KKwogMjAxNC0wOC0yOSAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXog IDxjbG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbSlNDXSBTb21lIEpTQyB0ZXN0cyBhcmUg ZGVwZW5kZW50IG9uIHRoZSBtYWNoaW5lIHRpbWUgem9uZS4KSW5kZXg6IFRvb2xzL1NjcmlwdHMv c3ZuLWFwcGx5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CShyZXZpc2lv biAxNzMwNjMpCisrKyBUb29scy9TY3JpcHRzL3N2bi1hcHBseQkod29ya2luZyBjb3B5KQpAQCAt MzUzLDEwICszNTMsMTAgQEAgc3ViIHBhdGNoKCQpCiAgICAgICAgIH0gZWxzaWYgKCRkZWxldGlv bikgewogICAgICAgICAgICAgYXBwbHlQYXRjaCgkcGF0Y2gsICRmdWxsUGF0aCwgWyItLWZvcmNl Il0pIGlmICRwYXRjaDsKICAgICAgICAgICAgIHNjbVJlbW92ZSgkZnVsbFBhdGgpOwotICAgICAg ICB9IGVsc2lmICgkYWRkaXRpb24pIHsKKyAgICAgICAgfSBlbHNpZiAoJGFkZGl0aW9uICYmICRo YXNUZXh0Q2h1bmtzKSB7CiAgICAgICAgICAgICAjIEFkZGl0aW9uCiAgICAgICAgICAgICByZW5h bWUoJGZ1bGxQYXRoLCAiJGZ1bGxQYXRoLm9yaWciKSBpZiAtZSAkZnVsbFBhdGg7Ci0gICAgICAg ICAgICBhcHBseVBhdGNoKCRwYXRjaCwgJGZ1bGxQYXRoKSBpZiAkcGF0Y2g7CisgICAgICAgICAg ICBhcHBseVBhdGNoKCRwYXRjaCwgJGZ1bGxQYXRoKTsKICAgICAgICAgICAgIHVubGluaygiJGZ1 bGxQYXRoLm9yaWciKSBpZiAtZSAiJGZ1bGxQYXRoLm9yaWciICYmIGNoZWNrc3VtKCRmdWxsUGF0 aCkgZXEgY2hlY2tzdW0oIiRmdWxsUGF0aC5vcmlnIik7CiAgICAgICAgICAgICBzY21BZGQoJGZ1 bGxQYXRoKTsKICAgICAgICAgICAgIG15ICRlc2NhcGVkRnVsbFBhdGggPSBlc2NhcGVTdWJ2ZXJz aW9uUGF0aCgiJGZ1bGxQYXRoLm9yaWciKTsKSW5kZXg6IFRvb2xzL1NjcmlwdHMvc3ZuLXVuYXBw bHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9zdm4tdW5hcHBseQkocmV2aXNpb24gMTcz MDYzKQorKysgVG9vbHMvU2NyaXB0cy9zdm4tdW5hcHBseQkod29ya2luZyBjb3B5KQpAQCAtMjAw LDEzICsyMDAsMTMgQEAgc3ViIHBhdGNoKCQpCiAKICAgICAgICAgICAgICMgU2hvdyBzdGF0dXMg aWYgdGhlIGZpbGUgaXMgbW9kaWZlZAogICAgICAgICAgICAgc3lzdGVtICJzdm4iLCAic3RhdCIs ICRlc2NhcGVkRnVsbFBhdGg7Ci0gICAgICAgIH0gZWxzaWYgKCRhZGRpdGlvbikgeworICAgICAg ICB9IGVsc2lmICgkYWRkaXRpb24gJiYgJGhhc1RleHRDaHVua3MpIHsKICAgICAgICAgICAgICMg UmV2ZXJzZSBhZGRpdGlvbgogICAgICAgICAgICAgIwogICAgICAgICAgICAgIyBGSVhNRTogVGhp cyBzaG91bGQgdXNlIHRoZSBzYW1lIGxvZ2ljIGFzIHN2bi1hcHBseSdzIGRlbGV0aW9uCiAgICAg ICAgICAgICAjICAgICAgICBjb2RlLiAgSW4gcGFydGljdWxhciwgc3ZuLWFwcGx5J3Mgc2NtUmVt b3ZlKCkgc3Vicm91dGluZQogICAgICAgICAgICAgIyAgICAgICAgc2hvdWxkIGJlIHVzZWQgaGVy ZS4KLSAgICAgICAgICAgIHVuYXBwbHlQYXRjaCgkcGF0Y2gsICRmdWxsUGF0aCwgWyItLWZvcmNl Il0pIGlmICRwYXRjaDsKKyAgICAgICAgICAgIHVuYXBwbHlQYXRjaCgkcGF0Y2gsICRmdWxsUGF0 aCwgWyItLWZvcmNlIl0pOwogICAgICAgICAgICAgdW5saW5rKCRmdWxsUGF0aCkgaWYgLXogJGZ1 bGxQYXRoOwogICAgICAgICAgICAgc3lzdGVtICJzdm4iLCAicmV2ZXJ0IiwgJGVzY2FwZWRGdWxs UGF0aDsKICAgICAgICAgfQo=