30826 2009-10-27 10:08:54 -0700 REGRESSION: svn-apply exits(1) when applying a patch with a file add 2009-10-27 10:38:40 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 29622 1 eric webkit-unassigned abarth commit-queue oldest_to_newest 158232 0 eric 2009-10-27 10:08:54 -0700 svn-apply git add is failing for the commit-queue I believe the problem is that svn-apply should be run with a CWD of the root of the repository. There is probably a second bug that svn-apply needs to know how to chdir itself to the root of the respository when running in git mode. 158244 1 eric 2009-10-27 10:26:40 -0700 This was caused by a bad patch for bug 29622. I'll post a fix in a sec. 158245 2 41962 eric 2009-10-27 10:30:42 -0700 Created attachment 41962 Patch v1 158248 3 41962 abarth 2009-10-27 10:32:25 -0700 Comment on attachment 41962 Patch v1 Ok. Perl is dumb. 158256 4 41962 commit-queue 2009-10-27 10:38:35 -0700 Comment on attachment 41962 Patch v1 Clearing flags on attachment: 41962 Committed r50157: <http://trac.webkit.org/changeset/50157> 158257 5 commit-queue 2009-10-27 10:38:40 -0700 All reviewed patches have been landed. Closing bug. 41962 2009-10-27 10:30:42 -0700 2009-10-27 10:38:34 -0700 Patch v1 bug-30826-20091027103040.patch text/plain 3609 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhMTJjZDRhLi44NTRjNzkyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMDktMTAt MjcgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJFR1JFU1NJT046IHN2bi1hcHBseSBleGl0cygx KSB3aGVuIGFwcGx5aW5nIGEgcGF0Y2ggd2l0aCBhIGZpbGUgYWRkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDgyNgorCisgICAgICAgICogU2NyaXB0 cy9zdm4tYXBwbHk6CisgICAgICAgICAtIEFkZCAoKSBhcm91bmQgYWxsIHN5c3RlbSgpIGNhbGxz LgorICAgICAgICAgLSBVc2UgdGhlIGNvcnJlY3Qgc3lzdGVtKCkgPT0gMCBvciBkaWUgaW5zdGVh ZCBvZiBzeXN0ZW0oKSBvciBkaWUKKyAgICAgICAgIC0gQWRkIGRlc2NyaXB0aXZlIG1lc3NhZ2Vz IHRvIGFsbCBkaWUgc3RhdGVtZW50cy4KKworMjAwOS0xMC0yNyAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KIAogICAgICAg ICBzdm4tYXBwbHkgY2FuIGV4aXQoMCkgZXZlbiBvbiBwYXRjaCBmYWlsdXJlCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3Zu LWFwcGx5CmluZGV4IDQwNjYyOTYuLjdkMTRlM2EgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvc3ZuLWFwcGx5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5CkBAIC0x NzUsOCArMTc1LDkgQEAgaWYgKCRtZXJnZSkgewogICAgIGRpZSAiLS1tZXJnZSBpcyBjdXJyZW50 bHkgb25seSBzdXBwb3J0ZWQgZm9yIFNWTiIgdW5sZXNzIGlzU1ZOKCk7CiAgICAgIyBIb3cgZG8g d2UgaGFuZGxlIEdpdCBwYXRjaGVzIGFwcGxpZWQgdG8gYW4gU1ZOIGNoZWNrb3V0IGhlcmU/CiAg ICAgZm9yIG15ICRmaWxlIChzb3J0IGtleXMgJXZlcnNpb25zKSB7Ci0gICAgICAgIHByaW50ICJH ZXR0aW5nIHZlcnNpb24gJHZlcnNpb25zeyRmaWxlfSBvZiAkZmlsZVxuIjsKLSAgICAgICAgc3lz dGVtICJzdm4iLCAidXBkYXRlIiwgIi1yIiwgJHZlcnNpb25zeyRmaWxlfSwgJGZpbGU7CisgICAg ICAgIG15ICR2ZXJzaW9uID0gJHZlcnNpb25zeyRmaWxlfTsKKyAgICAgICAgcHJpbnQgIkdldHRp bmcgdmVyc2lvbiAkdmVyc2lvbiBvZiAkZmlsZVxuIjsKKyAgICAgICAgc3lzdGVtKCJzdm4iLCAi dXBkYXRlIiwgIi1yIiwgJHZlcnNpb24sICRmaWxlKSA9PSAwIG9yIGRpZSAiRmFpbGVkIHRvIHJ1 biBzdm4gdXBkYXRlIC1yICR2ZXJzaW9uICRmaWxlLiI7CiAgICAgfQogfQogCkBAIC0yNjMsNyAr MjY0LDcgQEAgc3ViIGhhbmRsZUJpbmFyeUNoYW5nZSgkJCkKICAgICAjIFRoZSBsYXN0IGxpbmUg aXMgYWxsb3dlZCB0byBoYXZlIHVwIHRvIHR3byAnPScgY2hhcmFjdGVycyBhdCB0aGUgZW5kICh0 byBzaWduaWZ5IHBhZGRpbmcpLgogICAgIGlmICgkY29udGVudHMgPX4gbSMoKFxuW0EtWmEtejAt OSsvXXs3Nn0pKlxuW0EtWmEtejAtOSsvXXsyLDc0fT9bQS1aYS16MC05Ky89XXsyfVxuKSMpIHsK ICAgICAgICAgIyBBZGRpdGlvbiBvciBNb2RpZmljYXRpb24KLSAgICAgICAgb3BlbiBGSUxFLCAi PiIsICRmdWxsUGF0aCBvciBkaWU7CisgICAgICAgIG9wZW4gRklMRSwgIj4iLCAkZnVsbFBhdGgg b3IgZGllICJGYWlsZWQgdG8gb3BlbiAkZnVsbFBhdGguIjsKICAgICAgICAgcHJpbnQgRklMRSBk ZWNvZGVfYmFzZTY0KCQxKTsKICAgICAgICAgY2xvc2UgRklMRTsKICAgICAgICAgaWYgKCFzY21L bm93c09mRmlsZSgkZnVsbFBhdGgpKSB7CkBAIC0zNDMsNyArMzQ0LDcgQEAgc3ViIHBhdGNoKCQp CiAgICAgICAgICAgICB1bmxpbmsoIiRmdWxsUGF0aC5vcmlnIikgaWYgLWUgIiRmdWxsUGF0aC5v cmlnIiAmJiBjaGVja3N1bSgkZnVsbFBhdGgpIGVxIGNoZWNrc3VtKCIkZnVsbFBhdGgub3JpZyIp OwogICAgICAgICAgICAgc2NtQWRkKCRmdWxsUGF0aCk7CiAgICAgICAgICAgICAjIFdoYXQgaXMg dGhpcyBmb3I/Ci0gICAgICAgICAgICBzeXN0ZW0gInN2biIsICJzdGF0IiwgIiRmdWxsUGF0aC5v cmlnIiBpZiBpc1NWTigpICYmIC1lICIkZnVsbFBhdGgub3JpZyI7CisgICAgICAgICAgICBzeXN0 ZW0oInN2biIsICJzdGF0IiwgIiRmdWxsUGF0aC5vcmlnIikgaWYgaXNTVk4oKSAmJiAtZSAiJGZ1 bGxQYXRoLm9yaWciOwogICAgICAgICB9CiAgICAgfQogfQpAQCAtNDIyLDEwICs0MjMsMTAgQEAg c3ViIHNjbUNvcHkoJCQpCiB7CiAgICAgbXkgKCRzb3VyY2UsICRkZXN0aW5hdGlvbikgPSBAXzsK ICAgICBpZiAoaXNTVk4oKSkgewotICAgICAgICBzeXN0ZW0gInN2biIsICJjb3B5IiwgJHNvdXJj ZSwgJGRlc3RpbmF0aW9uIG9yIGRpZTsKKyAgICAgICAgc3lzdGVtKCJzdm4iLCAiY29weSIsICRz b3VyY2UsICRkZXN0aW5hdGlvbikgPT0gMCBvciBkaWUgIkZhaWxlZCB0byBzdm4gY29weSAkc291 cmNlICRkZXN0aW5hdGlvbi4iOwogICAgIH0gZWxzaWYgKGlzR2l0KCkpIHsKLSAgICAgICAgc3lz dGVtICJjcCIsICRzb3VyY2UsICRkZXN0aW5hdGlvbiBvciBkaWU7Ci0gICAgICAgIHN5c3RlbSAi Z2l0IiwgImFkZCIsICRkZXN0aW5hdGlvbiBvciBkaWU7CisgICAgICAgIHN5c3RlbSgiY3AiLCAk c291cmNlLCAkZGVzdGluYXRpb24pID09IDAgb3IgZGllICJGYWlsZWQgdG8gY29weSAkc291cmNl ICRkZXN0aW5hdGlvbi4iOworICAgICAgICBzeXN0ZW0oImdpdCIsICJhZGQiLCAkZGVzdGluYXRp b24pID09IDAgb3IgZGllICJGYWlsZWQgdG8gZ2l0IGFkZCAkZGVzdGluYXRpb24uIjsKICAgICB9 CiB9CiAKQEAgLTQzMyw5ICs0MzQsOSBAQCBzdWIgc2NtQWRkKCQpCiB7CiAgICAgbXkgKCRwYXRo KSA9IEBfOwogICAgIGlmIChpc1NWTigpKSB7Ci0gICAgICAgIHN5c3RlbSAic3ZuIiwgImFkZCIs ICRwYXRoIG9yIGRpZTsKKyAgICAgICAgc3lzdGVtKCJzdm4iLCAiYWRkIiwgJHBhdGgpID09IDAg b3IgZGllICJGYWlsZWQgdG8gc3ZuIGFkZCAkcGF0aC4iOwogICAgIH0gZWxzaWYgKGlzR2l0KCkp IHsKLSAgICAgICAgc3lzdGVtICJnaXQiLCAiYWRkIiwgJHBhdGggb3IgZGllOworICAgICAgICBz eXN0ZW0oImdpdCIsICJhZGQiLCAkcGF0aCkgPT0gMCBvciBkaWUgIkZhaWxlZCB0byBnaXQgYWRk ICRwYXRoLiI7CiAgICAgfQogfQogCkBAIC00NTMsNiArNDU0LDYgQEAgc3ViIHNjbVJlbW92ZSgk KQogICAgICAgICBjbG9zZSBTVk47CiAgICAgICAgIHByaW50ICRzdm5PdXRwdXQgaWYgJHN2bk91 dHB1dDsKICAgICB9IGVsc2lmIChpc0dpdCgpKSB7Ci0gICAgICAgIHN5c3RlbSAiZ2l0IiwgInJt IiwgIi0tZm9yY2UiLCAkcGF0aCBvciBkaWU7CisgICAgICAgIHN5c3RlbSgiZ2l0IiwgInJtIiwg Ii0tZm9yY2UiLCAkcGF0aCkgPT0gMCBvciBkaWUgICJGYWlsZWQgdG8gZ2l0IHJtIC0tZm9yY2Ug JHBhdGguIjsKICAgICB9CiB9