136507 2014-09-03 15:17:54 -0700 Make images work with patches created using svn 1.7 2014-09-03 23:47:02 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer aroben commit-queue darin dbates dfarler hyatt joepeck mrobinson ossy simon.fraser oldest_to_newest 1033052 0 ddkilzer 2014-09-03 15:17:54 -0700 Subversion 1.7 does this crazy thing where it emits a text patch for the property changes of a newly added image, immediately after the original "diff" header: Index: simple-gradients-expected.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: simple-gradients-expected.png =================================================================== --- simple-gradients-expected.png (revision 0) +++ simple-gradients-expected.png (working copy) Property changes on: simple-gradients-expected.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property This greatly confuses PrettyPatch.rb because the first patch looked like the image was being removed, and the second patch looked like normal diff (until the blank line and the property changes are hit). 1033057 1 237590 ddkilzer 2014-09-03 15:27:58 -0700 Created attachment 237590 Patch v1 1033152 2 237590 commit-queue 2014-09-03 23:46:58 -0700 Comment on attachment 237590 Patch v1 Clearing flags on attachment: 237590 Committed r173253: <http://trac.webkit.org/changeset/173253> 1033153 3 commit-queue 2014-09-03 23:47:02 -0700 All reviewed patches have been landed. Closing bug. 237590 2014-09-03 15:27:58 -0700 2014-09-03 23:46:57 -0700 Patch v1 bug-136507-20140903152751.patch text/plain 5809 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMTkxCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9idWdzLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCAzY2UzODUxZGNjYTI3ZWJjMTM3NjdkZTZkYWNhMWUyNzBjNzg2ZDQ1Li5jMDNiYTUzMmEw MjY5YThhZDgxMjcwZWNhY2FiOTI2NGU4OTllZWJhIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9idWdz LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxNC0wOS0wMyAgRGF2aWQgS2lsemVyICA8ZGRraWx6 ZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgaW1hZ2VzIHdvcmsgd2l0aCBwYXRjaGVzIGNy ZWF0ZWQgdXNpbmcgc3ZuIDEuNworICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi8xMzY1MDc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQcmV0 dHlQYXRjaC9QcmV0dHlQYXRjaC5yYjoKKyAgICAgICAgKFByZXR0eVBhdGNoLnByZXR0aWZ5KTog RGVsZXRlIHJlZHVuZGFudCBwYXRjaGVzIHRoYXQgY2xhaW0KKyAgICAgICAgbmV3bHkgYWRkZWQg aW1hZ2VzIGFyZSBhY3R1YWxseSByZW1vdmVkLgorICAgICAgICAoUHJldHR5UGF0Y2guU1ZOX0JJ TkFSWV9GSUxFX01BUktFUl9GT1JNQVQpOiBSZW5hbWUgZnJvbQorICAgICAgICBCSU5BUllfRklM RV9NQVJLRVJfRk9STUFULgorICAgICAgICAoUHJldHR5UGF0Y2guU1ZOX0lNQUdFX0ZJTEVfTUFS S0VSX0ZPUk1BVCk6IFJlbmFtZSBmcm9tCisgICAgICAgIElNQUdFX0ZJTEVfTUFSS0VSX0ZPUk1B VC4KKyAgICAgICAgKFByZXR0eVBhdGNoLlNWTl9QUk9QRVJUWV9DSEFOR0VTX0ZPUk1BVCk6IEFk ZC4gVXNlZCB0byBmaW5kCisgICAgICAgIGFuZCBpZ25vcmUgcHJvcGVydHkgY2hhbmdlcyBpbiBz dm4gMS43IHBhdGNoZXMuCisgICAgICAgIChQcmV0dHlQYXRjaC5TVk5fU1RBUlRfT0ZfQklOQVJZ X0RBVEFfRk9STUFUKTogUmVuYW1lIGZyb20KKyAgICAgICAgU1RBUlRfT0ZfQklOQVJZX0RBVEFf Rk9STUFULgorICAgICAgICAoRmlsZURpZmYuZmlsZW5hbWUpOiBBZGQgcmVhZC1vbmx5IGFjY2Vz c29yLgorICAgICAgICAoRmlsZURpZmYuaW1hZ2UpOiBBZGQgcmVhZC1vbmx5IGFjY2Vzc29yLgor ICAgICAgICAoRmlsZURpZmYuaW1hZ2VfdXJsKTogQWRkIHJlYWQtb25seSBhY2Nlc3Nvci4KKyAg ICAgICAgKEZpbGVEaWZmLmluaXRpYWxpemUpOiBBZGQgc3BlY2lhbCBjYXNlIGZvciBzdm4tMS43 IGltYWdlCisgICAgICAgIHBhdGNoZXMgdGhhdCBhZGQgYSBmaWxlLiAgVXBkYXRlIHZhcmlvdXMg cmVnZXggY29uc3RhbnRzIHBlcgorICAgICAgICBhYm92ZS4KKwogMjAxNC0wMi0yNSAgSm96c2Vm IEJlcnRhICA8amJlcnRhLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CiAKICAgICAgICAg UHJldHR5UGF0Y2gucmIgc2hvdWxkIGJlIG1vcmUgZGVzY3JpcHRpdmUgZm9yICJnaXQgZGlmZiAt TSIgc3R5bGVkIHBhdGNoZXMKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9Q cmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYiBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0 dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgppbmRleCAxY2NmODc3ZDE2ZDE2OWNmYWRiMzUyMzFjMjFm ZDc1N2QzNDRjNzExLi4yNzhjM2ZlZmEzMGEwOGVmMjliYWVlM2RhODRiZWY0YmZiMDljNzk0IDEw MDY0NAotLS0gYS9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvUHJldHR5UGF0Y2gvUHJldHR5UGF0 Y2gucmIKKysrIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1ByZXR0eVBhdGNoL1ByZXR0eVBh dGNoLnJiCkBAIC0zMiw2ICszMiwxNiBAQCBwdWJsaWMKIAogICAgICAgICBmaWxlRGlmZnMgPSBG aWxlRGlmZi5wYXJzZShzdHJpbmcpCiAKKyAgICAgICAgIyBOZXdseSBhZGRlZCBpbWFnZXMgZ2V0 IHR3byBkaWZmcyB3aXRoIHN2biAxLjc7IHRvc3MgdGhlIGZpcnN0IG9uZS4KKyAgICAgICAgZGVs ZXRlSW5kaWNlcyA9IFtdCisgICAgICAgIGZvciBpIGluIDEuLi5maWxlRGlmZnMubGVuZ3RoCisg ICAgICAgICAgICBwcmV2ID0gaSAtIDEKKyAgICAgICAgICAgIGlmIGZpbGVEaWZmc1twcmV2XS5p bWFnZSBhbmQgbm90IGZpbGVEaWZmc1twcmV2XS5pbWFnZV91cmwgYW5kIGZpbGVEaWZmc1tpXS5p bWFnZSBhbmQgZmlsZURpZmZzW2ldLmltYWdlX3VybCBhbmQgZmlsZURpZmZzW3ByZXZdLmZpbGVu YW1lID09IGZpbGVEaWZmc1tpXS5maWxlbmFtZQorICAgICAgICAgICAgICAgIGRlbGV0ZUluZGlj ZXMudW5zaGlmdChwcmV2KQorICAgICAgICAgICAgZW5kCisgICAgICAgIGVuZAorICAgICAgICBk ZWxldGVJbmRpY2VzLmVhY2h7IHxpfCBmaWxlRGlmZnMuZGVsZXRlX2F0KGkpIH0KKwogICAgICAg ICAkbGFzdF9wcmV0dGlmeV9maWxlX2NvdW50ID0gZmlsZURpZmZzLmxlbmd0aAogICAgICAgICBz dHIgPDwgZmlsZURpZmZzLmNvbGxlY3R7IHxkaWZmfCBkaWZmLnRvX2h0bWwgfS5qb2luCiAgICAg ICAgIHN0ciA8PCAiPC9ib2R5PjwvaHRtbD4iCkBAIC02Myw5ICs3MywxMSBAQCBwcml2YXRlCiAK ICAgICBSRU5BTUVfRlJPTSA9IC9ecmVuYW1lIGZyb20gKC4qKS8KIAotICAgIEJJTkFSWV9GSUxF X01BUktFUl9GT1JNQVQgPSAvXkNhbm5vdCBkaXNwbGF5OiBmaWxlIG1hcmtlZCBhcyBhIGJpbmFy eSB0eXBlLiQvCisgICAgU1ZOX0JJTkFSWV9GSUxFX01BUktFUl9GT1JNQVQgPSAvXkNhbm5vdCBk aXNwbGF5OiBmaWxlIG1hcmtlZCBhcyBhIGJpbmFyeSB0eXBlLiQvCiAKLSAgICBJTUFHRV9GSUxF X01BUktFUl9GT1JNQVQgPSAvXnN2bjptaW1lLXR5cGUgPSBpbWFnZVwvcG5nJC8KKyAgICBTVk5f SU1BR0VfRklMRV9NQVJLRVJfRk9STUFUID0gL15zdm46bWltZS10eXBlID0gaW1hZ2VcL3BuZyQv CisKKyAgICBTVk5fUFJPUEVSVFlfQ0hBTkdFU19GT1JNQVQgPSAvXlByb3BlcnR5IGNoYW5nZXMg b246ICguKikvCiAKICAgICBHSVRfSU5ERVhfTUFSS0VSX0ZPUk1BVCA9IC9eaW5kZXggKFswLTlh LWZdezQwfSlcLlwuKFswLTlhLWZdezQwfSkvCiAKQEAgLTc3LDcgKzg5LDcgQEAgcHJpdmF0ZQog CiAgICAgR0lUX0RFTFRBX0ZPUk1BVCA9IC9eZGVsdGEgXGQrJC8KIAotICAgIFNUQVJUX09GX0JJ TkFSWV9EQVRBX0ZPUk1BVCA9IC9eWzAtOWEtekEtWlwrXC89XXsyMCx9LyAjIEFzc3VtZSAyMCBj aGFycyB3aXRob3V0IGEgc3BhY2UgaXMgYmFzZTY0IGJpbmFyeSBkYXRhLgorICAgIFNWTl9TVEFS VF9PRl9CSU5BUllfREFUQV9GT1JNQVQgPSAvXlswLTlhLXpBLVpcK1wvPV17MjAsfS8gIyBBc3N1 bWUgMjAgY2hhcnMgd2l0aG91dCBhIHNwYWNlIGlzIGJhc2U2NCBiaW5hcnkgZGF0YS4KIAogICAg IFNUQVJUX09GX1NFQ1RJT05fRk9STUFUID0gL15AQCAtKFxkKykoPzosKFxkKykpPyBcKyhcZCsp KD86LChcZCspKT8gQEBccyooLiopLwogCkBAIC01MzAsNiArNTQyLDEwIEBAIEVPRgogICAgIGVu ZAogCiAgICAgY2xhc3MgRmlsZURpZmYKKyAgICAgICAgYXR0cl9yZWFkZXIgOmZpbGVuYW1lCisg ICAgICAgIGF0dHJfcmVhZGVyIDppbWFnZQorICAgICAgICBhdHRyX3JlYWRlciA6aW1hZ2VfdXJs CisKICAgICAgICAgZGVmIGluaXRpYWxpemUobGluZXMpCiAgICAgICAgICAgICBAZmlsZW5hbWUg PSBQcmV0dHlQYXRjaC5maWxlbmFtZV9mcm9tX2RpZmZfaGVhZGVyKGxpbmVzWzBdLmNob21wKQog ICAgICAgICAgICAgc3RhcnRPZlNlY3Rpb25zID0gMQpAQCAtNTQxLDE1ICs1NTcsMjkgQEAgRU9G CiAgICAgICAgICAgICAgICAgICAgIEBmaWxlbmFtZSA9IFByZXR0eVBhdGNoLmZpbGVuYW1lX2Zy b21fZGlmZl9oZWFkZXIobGluZXNbaV0uY2hvbXApIGlmIEBmaWxlbmFtZS5uaWw/CiAgICAgICAg ICAgICAgICAgICAgIEB0byA9IFByZXR0eVBhdGNoLnJldmlzaW9uT3JEZXNjcmlwdGlvbihsaW5l c1tpXSkKICAgICAgICAgICAgICAgICAgICAgc3RhcnRPZlNlY3Rpb25zID0gaSArIDEKKworICAg ICAgICAgICAgICAgICAgICAjIENoZWNrIGZvciAncHJvcGVydHknIHBhdGNoLCB0aGVuIGltYWdl IGRhdGEsIHNpbmNlIHN2biAxLjcgY3JlYXRlcyBhIGZha2UgcGF0Y2ggZm9yIHByb3BlcnR5IGNo YW5nZXMuCisgICAgICAgICAgICAgICAgICAgIGlmIC9eJC8ubWF0Y2gobGluZXNbc3RhcnRPZlNl Y3Rpb25zXSkgYW5kIFNWTl9QUk9QRVJUWV9DSEFOR0VTX0ZPUk1BVC5tYXRjaChsaW5lc1tzdGFy dE9mU2VjdGlvbnMgKyAxXSkgdGhlbgorICAgICAgICAgICAgICAgICAgICAgICAgc3RhcnRPZlNl Y3Rpb25zICs9IDIKKyAgICAgICAgICAgICAgICAgICAgICAgIGZvciB4IGluIHN0YXJ0T2ZTZWN0 aW9ucy4uLmxpbmVzLmxlbmd0aAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5leHQgaWYg bm90IC9eJC8ubWF0Y2gobGluZXNbeF0pCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYg U1ZOX1NUQVJUX09GX0JJTkFSWV9EQVRBX0ZPUk1BVC5tYXRjaChsaW5lc1t4ICsgMV0pIHRoZW4K KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhcnRPZlNlY3Rpb25zID0geCArIDEK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQGJpbmFyeSA9IHRydWUKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgQGltYWdlID0gdHJ1ZQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVuZAorICAg ICAgICAgICAgICAgICAgICAgICAgZW5kCisgICAgICAgICAgICAgICAgICAgIGVuZAogICAgICAg ICAgICAgICAgICAgICBicmVhawotICAgICAgICAgICAgICAgIHdoZW4gQklOQVJZX0ZJTEVfTUFS S0VSX0ZPUk1BVAorICAgICAgICAgICAgICAgIHdoZW4gU1ZOX0JJTkFSWV9GSUxFX01BUktFUl9G T1JNQVQKICAgICAgICAgICAgICAgICAgICAgQGJpbmFyeSA9IHRydWUKLSAgICAgICAgICAgICAg ICAgICAgaWYgKElNQUdFX0ZJTEVfTUFSS0VSX0ZPUk1BVC5tYXRjaChsaW5lc1tpICsgMV0pIG9y IFByZXR0eVBhdGNoLmhhc19pbWFnZV9zdWZmaXgoQGZpbGVuYW1lKSkgdGhlbgorICAgICAgICAg ICAgICAgICAgICBpZiAoU1ZOX0lNQUdFX0ZJTEVfTUFSS0VSX0ZPUk1BVC5tYXRjaChsaW5lc1tp ICsgMV0pIG9yIFByZXR0eVBhdGNoLmhhc19pbWFnZV9zdWZmaXgoQGZpbGVuYW1lKSkgdGhlbgog ICAgICAgICAgICAgICAgICAgICAgICAgQGltYWdlID0gdHJ1ZQogICAgICAgICAgICAgICAgICAg ICAgICAgc3RhcnRPZlNlY3Rpb25zID0gaSArIDIKICAgICAgICAgICAgICAgICAgICAgICAgIGZv ciB4IGluIHN0YXJ0T2ZTZWN0aW9ucy4uLmxpbmVzLmxlbmd0aAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICMgQmluYXJ5IGRpZmZzIG9mdGVuIGhhdmUgcHJvcGVydHkgY2hhbmdlcyBsaXN0 ZWQgYmVmb3JlIHRoZSBhY3R1YWwgYmluYXJ5IGRhdGEuICBTa2lwIHRoZW0uCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgaWYgU1RBUlRfT0ZfQklOQVJZX0RBVEFfRk9STUFULm1hdGNoKGxp bmVzW3hdKSB0aGVuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgU1ZOX1NUQVJUX09G X0JJTkFSWV9EQVRBX0ZPUk1BVC5tYXRjaChsaW5lc1t4XSkgdGhlbgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzdGFydE9mU2VjdGlvbnMgPSB4CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGJyZWFrCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW5kCg==