32438 2009-12-11 10:03:07 -0800 svn-apply can't handle git diffs generated with --no-prefix 2010-05-04 01:01:49 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric cjerdonek abarth aroben cjerdonek dbates oldest_to_newest 170798 0 eric 2009-12-11 10:03:07 -0800 svn-apply can't handle git diffs generated with --no-prefix https://bugs.webkit.org/show_bug.cgi?id=32335#c11 213793 1 eric 2010-04-18 13:27:10 -0700 Struck again! https://bugs.webkit.org/show_bug.cgi?id=20219#c14 Seems we should at least make svn-apply error out nicely in this case. Right now it silently fails. 220430 2 54986 cjerdonek 2010-05-03 19:56:40 -0700 Created attachment 54986 Proposed patch 220433 3 54986 eric 2010-05-03 20:18:46 -0700 Comment on attachment 54986 Proposed patch LGTM. 220514 4 54986 cjerdonek 2010-05-04 01:01:29 -0700 Comment on attachment 54986 Proposed patch Clearing flags on attachment: 54986 Committed r58741: <http://trac.webkit.org/changeset/58741> 220515 5 cjerdonek 2010-05-04 01:01:49 -0700 All reviewed patches have been landed. Closing bug. 54986 2010-05-03 19:56:40 -0700 2010-05-04 01:01:29 -0700 Proposed patch _patch-32438-1.diff text/plain 3383 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYWY0Yzg5Li4yYTU2MDgyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDUt MDMgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRqdXN0ZWQgc3ZuLWFwcGx5IGFu ZCAtdW5hcHBseSB0byBhY2NlcHQgZ2l0IGRpZmZzIGdlbmVyYXRlZAorICAgICAgICB1c2luZyB0 aGUgLS1uby1wcmVmaXggZmxhZy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzI0MzgKKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06Cisg ICAgICAgICAgLSBMb29zZW5lZCB0aGUgcmVndWxhciBleHByZXNzaW9uIGZvciB0aGUgImRpZmYg LS1naXQiIGxpbmUgdG8KKyAgICAgICAgICAgIG1hdGNoIHdoZW4gdGhlIC0tbm8tcHJlZml4IGZs YWcgaXMgdXNlZCB3aXRoICJnaXQgZGlmZiIuCisgICAgICAgICAgLSBBbHNvIHJlZmFjdG9yZWQg dGhlIGNvZGUgcGFyc2luZyB0aGUgZmlyc3QgbGluZSBzbyB0aGF0IHRoZQorICAgICAgICAgICAg c2NyaXB0IGV4aXRzIHdpdGggYW4gZXJyb3IgbWVzc2FnZSBpZiB0aGUgZmlyc3QgbGluZSBjYW5u b3QKKyAgICAgICAgICAgIGJlIHBhcnNlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwv VkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VHaXREaWZmSGVhZGVyLnBsOgorICAgICAgICAgIC0gQWRk ZWQgYSB1bml0IHRlc3QgY2FzZSBmb3IgdGhlIC0tbm8tcHJlZml4IGNhc2UuCisKIDIwMTAtMDUt MDMgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0 aWxzLnBtIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQppbmRleCA0NGNlNDU4Li4z YTE5NWQwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KQEAgLTQzOSwxNCArNDM5LDE3IEBAIHN1 YiBwYXJzZUdpdERpZmZIZWFkZXIoJCQpCiAKICAgICAkXyA9ICRsaW5lOwogCi0gICAgbXkgJGhl YWRlclN0YXJ0UmVnRXggPSBxci9eZGlmZiAtLWdpdCAvOwotCi0gICAgaWYgKCEvJGhlYWRlclN0 YXJ0UmVnRXgvKSB7Ci0gICAgICAgIGRpZSgiRmlyc3QgbGluZSBvZiBHaXQgZGlmZiBkb2VzIG5v dCBiZWdpbiB3aXRoIFwiZGlmZiAtLWdpdCBcIjogXCIkX1wiIik7CisgICAgbXkgJGhlYWRlclN0 YXJ0UmVnRXggPSBxciNeZGlmZiAtLWdpdCAoXHcvKT8oLispIChcdy8pPyhbXlxyXG5dKykjOwor ICAgIG15ICRpbmRleFBhdGg7CisgICAgaWYgKC8kaGVhZGVyU3RhcnRSZWdFeC8pIHsKKyAgICAg ICAgJGluZGV4UGF0aCA9ICQyOworICAgICAgICAjIFVzZSAkUE9TVE1BVENIIHRvIHByZXNlcnZl IHRoZSBlbmQtb2YtbGluZSBjaGFyYWN0ZXIuCisgICAgICAgICRfID0gIkluZGV4OiAkaW5kZXhQ YXRoJFBPU1RNQVRDSCI7ICMgQ29udmVydCB0byBTVk4gZm9ybWF0LgorICAgIH0gZWxzZSB7Cisg ICAgICAgIGRpZSgiQ291bGQgbm90IHBhcnNlIGxlYWRpbmcgXCJkaWZmIC0tZ2l0XCIgbGluZTog XCIkbGluZVwiLiIpOwogICAgIH0KIAogICAgIG15ICRmb3VuZEhlYWRlckVuZGluZzsKLSAgICBt eSAkaW5kZXhQYXRoOwogICAgIG15ICRuZXdFeGVjdXRhYmxlQml0ID0gMDsKICAgICBteSAkb2xk RXhlY3V0YWJsZUJpdCA9IDA7CiAgICAgbXkgJHN2bkNvbnZlcnRlZFRleHQ7CkBAIC00NTYsMTAg KzQ1OSw3IEBAIHN1YiBwYXJzZUdpdERpZmZIZWFkZXIoJCQpCiAgICAgICAgIHMvKFtcblxyXSsp JC8vOwogICAgICAgICBteSAkZW9sID0gJDE7CiAKLSAgICAgICAgaWYgKG0jXmRpZmYgLS1naXQg XHcvKC4rKSBcdy8oW15cclxuXSspIykgewotICAgICAgICAgICAgJGluZGV4UGF0aCA9ICQxOwot ICAgICAgICAgICAgJF8gPSAiSW5kZXg6ICRpbmRleFBhdGgiOyAjIENvbnZlcnQgdG8gU1ZOIGZv cm1hdC4KLSAgICAgICAgfSBlbHNpZiAoL14oZGVsZXRlZCBmaWxlfG9sZCkgbW9kZSAoWzAtOV17 Nn0pLykgeworICAgICAgICBpZiAoL14oZGVsZXRlZCBmaWxlfG9sZCkgbW9kZSAoWzAtOV17Nn0p LykgewogICAgICAgICAgICAgJG9sZEV4ZWN1dGFibGVCaXQgPSAoaXNFeGVjdXRhYmxlKCQyKSA/ IDEgOiAwKTsKICAgICAgICAgfSBlbHNpZiAoL15uZXcoIGZpbGUpPyBtb2RlIChbMC05XXs2fSkv KSB7CiAgICAgICAgICAgICAkbmV3RXhlY3V0YWJsZUJpdCA9IChpc0V4ZWN1dGFibGUoJDIpID8g MSA6IDApOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0 aWxzX3VuaXR0ZXN0L3BhcnNlR2l0RGlmZkhlYWRlci5wbCBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZUdpdERpZmZIZWFkZXIucGwKaW5kZXgg ODY4OWVkZi4uMDRjNzU3MiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw ZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlR2l0RGlmZkhlYWRlci5wbAorKysgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VHaXREaWZmSGVh ZGVyLnBsCkBAIC04Myw2ICs4MywzMCBAQCBFTkQKICJAQCAtMCwwICsxLDM0IEBAXG4iXSwKICAg ICBleHBlY3RlZE5leHRMaW5lID0+ICIrPGh0bWw+XG4iLAogfSwKK3sgICAjIE5ldyB0ZXN0Cisg ICAgZGlmZk5hbWUgPT4gInVzaW5nIC0tbm8tcHJlZml4IiwKKyAgICBpbnB1dFRleHQgPT4gPDwn RU5EJywKK2RpZmYgLS1naXQgZm9vLmggZm9vLmgKK2luZGV4IGM5MjU3ODAuLjllNjVjNDMgMTAw NjQ0CistLS0gZm9vLmgKKysrKyBmb28uaAorQEAgLTEsMyArMSwxNyBAQAorK2NvbnRlbnRzCitF TkQKKyAgICBleHBlY3RlZFJldHVybiA9PiBbCit7CisgICAgc3ZuQ29udmVydGVkVGV4dCA9PiA8 PCdFTkQnLAorSW5kZXg6IGZvby5oCitpbmRleCBjOTI1NzgwLi45ZTY1YzQzIDEwMDY0NAorLS0t IGZvby5oCisrKysgZm9vLmgKK0VORAorICAgIGV4ZWN1dGFibGVCaXREZWx0YSA9PiAwLAorICAg IGluZGV4UGF0aCA9PiAiZm9vLmgiLAorfSwKKyJAQCAtMSwzICsxLDE3IEBAXG4iXSwKKyAgICBl eHBlY3RlZE5leHRMaW5lID0+ICIrY29udGVudHNcbiIsCit9LAogIyMjIwogIyAgICBCaW5hcnkg ZmlsZSB0ZXN0IGNhc2VzCiAjIwo=