27168 2009-07-10 18:03:15 -0700 With Subversion 1.6, update-webkit prompts on conflicts 2009-09-02 08:27:58 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mitz webkit-unassigned ddkilzer sam oldest_to_newest 131034 0 mitz 2009-07-10 18:03:15 -0700 With Subversion, 1.6, svn prompts on conflicts by default, so when running update-webkit when there are conflicts (such as in ChangeLog files), the user is prompted to deal with the conflicts (even though update-webkit can resolve certain conflicts automatically). I think this can be changed by passing a certain option to svn if the version is 1.6 or later. 131036 1 mrowe 2009-07-10 18:12:31 -0700 I think the option in question is "--accept postpone" 144079 2 38904 ddkilzer 2009-09-01 17:59:28 -0700 Created attachment 38904 Clean up VCSUtils.pm 144080 3 38905 ddkilzer 2009-09-01 17:59:32 -0700 Created attachment 38905 Moved svn 1.6 version check into VCSUtils::isSVNVersion16OrNewer() 144081 4 38906 ddkilzer 2009-09-01 17:59:35 -0700 Created attachment 38906 With Subversion 1.6, update-webkit prompts on conflicts 144123 5 38904 eric 2009-09-02 00:17:40 -0700 Comment on attachment 38904 Clean up VCSUtils.pm Looks sane. :) I dream of the day when this and scm.py are one. :) This ChangeLog patch will probably confuse our tools, so cq- (that, and you're a committer). 144124 6 38905 eric 2009-09-02 00:20:02 -0700 Comment on attachment 38905 Moved svn 1.6 version check into VCSUtils::isSVNVersion16OrNewer() LGTM! cq- for changlog confusion and that your'e a committer. 144125 7 38906 eric 2009-09-02 00:21:45 -0700 Comment on attachment 38906 With Subversion 1.6, update-webkit prompts on conflicts Seems a comment in the script would be useful. This looks good though. 144212 8 ddkilzer 2009-09-02 08:25:45 -0700 Committed rr47969: <http://trac.webkit.org/changeset/r47969> 144213 9 ddkilzer 2009-09-02 08:25:55 -0700 Committed rr47970: <http://trac.webkit.org/changeset/r47970> 144214 10 ddkilzer 2009-09-02 08:26:19 -0700 Committed rr47971: <http://trac.webkit.org/changeset/r47971> 144215 11 ddkilzer 2009-09-02 08:27:58 -0700 Oops...bug in bugzilla-tool mark-fixed: Committed r47969: <http://trac.webkit.org/changeset/47969> Committed r47970: <http://trac.webkit.org/changeset/47970> Committed r47971: <http://trac.webkit.org/changeset/47971> 38904 2009-09-01 17:59:28 -0700 2009-09-02 00:17:40 -0700 Clean up VCSUtils.pm bug-27168-20090901175927.patch text/plain 2466 ddkilzer ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5ZTY0MTExLi44ZWY5Y2RlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMDktMDkt MDEgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAorICAgICAgICBDbGVhbiB1 cCBWQ1NVdGlscy5wbQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogU2NyaXB0cy9WQ1NVdGlscy5wbTogQWRkZWQgcHJvcGVyIHBhY2thZ2Ugc3RhdGVt ZW50LiAgRml4ZWQKKyAgICAgICAgaW5kZW50YXRpb24gb2YgQkVHSU4gYmxvY2suICBMaXN0ZWQg ZWFjaCBleHBvcnRlZCBtZXRob2Qgb24gYQorICAgICAgICBsaW5lIGJ5IGl0c2VsZi4gIEFkZGVk IG1ldGhvZHMgdG8gdGhlIGV4cG9ydCBsaXN0IGFmdGVyIGFkZGluZworICAgICAgICB0aGUgcGFj a2FnZSBzdGF0ZW1lbnQuICBTb3J0ZWQgbW9kdWxlIHZhcmlhYmxlcy4gIE1vdmVkCisgICAgICAg IGRlZmluaXRvbiBvZiAkZ2l0Um9vdCBuZXh0IHRvIG90aGVyIG1vZHVsZSB2YXJpYWJsZXMuCisK KzIwMDktMDktMDEgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKwogICAgICAg ICA8aHR0cDovL3dlYmtpdC5vcmcvYi8yODg3Nz4gSW1wbGVtZW50IGJ1Z3ppbGxhLXRvb2wgbWFy ay1maXhlZAogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvVkNT VXRpbHMucG0KaW5kZXggNTcxNDg3ZC4uYThmMDMxNCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9WQ1NVdGlscy5wbQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBt CkBAIC0yNSw2ICsyNSw3IEBACiAjIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKICMgTW9kdWxlIHRvIHNoYXJlIGNvZGUg dG8gd29yayB3aXRoIHZhcmlvdXMgdmVyc2lvbiBjb250cm9sIHN5c3RlbXMuCitwYWNrYWdlIFZD U1V0aWxzOwogCiB1c2Ugc3RyaWN0OwogdXNlIHdhcm5pbmdzOwpAQCAtMzQsMjEgKzM1LDM1IEBA IHVzZSBGaWxlOjpCYXNlbmFtZTsKIHVzZSBGaWxlOjpTcGVjOwogCiBCRUdJTiB7Ci0gICB1c2Ug RXhwb3J0ZXIgICAoKTsKLSAgIG91ciAoJFZFUlNJT04sIEBJU0EsIEBFWFBPUlQsIEBFWFBPUlRf T0ssICVFWFBPUlRfVEFHUyk7Ci0gICAkVkVSU0lPTiAgICAgPSAxLjAwOwotICAgQElTQSAgICAg ICAgID0gcXcoRXhwb3J0ZXIpOwotICAgQEVYUE9SVCAgICAgID0gcXcoJmNoZGlyUmV0dXJuaW5n UmVsYXRpdmVQYXRoICZkZXRlcm1pbmVTVk5Sb290ICZkZXRlcm1pbmVWQ1NSb290ICZpc0dpdCAm aXNHaXREaXJlY3RvcnkgJmlzU1ZOICZpc1NWTkRpcmVjdG9yeSAmbWFrZUZpbGVQYXRoUmVsYXRp dmUpOwotICAgJUVYUE9SVF9UQUdTID0gKCApOwotICAgQEVYUE9SVF9PSyAgID0gKCk7CisgICAg dXNlIEV4cG9ydGVyICAgKCk7CisgICAgb3VyICgkVkVSU0lPTiwgQElTQSwgQEVYUE9SVCwgQEVY UE9SVF9PSywgJUVYUE9SVF9UQUdTKTsKKyAgICAkVkVSU0lPTiAgICAgPSAxLjAwOworICAgIEBJ U0EgICAgICAgICA9IHF3KEV4cG9ydGVyKTsKKyAgICBARVhQT1JUICAgICAgPSBxdygKKyAgICAg ICAgJmNoZGlyUmV0dXJuaW5nUmVsYXRpdmVQYXRoCisgICAgICAgICZkZXRlcm1pbmVTVk5Sb290 CisgICAgICAgICZkZXRlcm1pbmVWQ1NSb290CisgICAgICAgICZnaXRCcmFuY2gKKyAgICAgICAg JmlzR2l0CisgICAgICAgICZpc0dpdEJyYW5jaEJ1aWxkCisgICAgICAgICZpc0dpdERpcmVjdG9y eQorICAgICAgICAmaXNTVk4KKyAgICAgICAgJmlzU1ZORGlyZWN0b3J5CisgICAgICAgICZtYWtl RmlsZVBhdGhSZWxhdGl2ZQorICAgICAgICAmcGF0aFJlbGF0aXZlVG9TVk5SZXBvc2l0b3J5Um9v dEZvclBhdGgKKyAgICAgICAgJnN2blJldmlzaW9uRm9yRGlyZWN0b3J5CisgICAgKTsKKyAgICAl RVhQT1JUX1RBR1MgPSAoICk7CisgICAgQEVYUE9SVF9PSyAgID0gKCk7CiB9CiAKIG91ciBARVhQ T1JUX09LOwogCi1teSAkaXNHaXQ7Ci1teSAkaXNTVk47CiBteSAkZ2l0QnJhbmNoOworbXkgJGdp dFJvb3Q7CitteSAkaXNHaXQ7CiBteSAkaXNHaXRCcmFuY2hCdWlsZDsKK215ICRpc1NWTjsKIAog c3ViIGlzR2l0RGlyZWN0b3J5KCQpCiB7CkBAIC0yMDYsOCArMjIxLDYgQEAgc3ViIHBhdGhSZWxh dGl2ZVRvU1ZOUmVwb3NpdG9yeVJvb3RGb3JQYXRoKCQpCiAgICAgcmV0dXJuICRzdm5VUkw7CiB9 CiAKLQotbXkgJGdpdFJvb3Q7CiBzdWIgbWFrZUZpbGVQYXRoUmVsYXRpdmUoJCkKIHsKICAgICBt eSAoJHBhdGgpID0gQF87 38905 2009-09-01 17:59:32 -0700 2009-09-02 00:20:01 -0700 Moved svn 1.6 version check into VCSUtils::isSVNVersion16OrNewer() bug-27168-20090901175930.patch text/plain 4151 ddkilzer ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4ZWY5Y2RlLi4yZDI0MmU4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIgQEAKIDIwMDktMDkt MDEgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAorICAgICAgICBNb3ZlZCBz dm4gMS42IHZlcnNpb24gY2hlY2sgaW50byBWQ1NVdGlsczo6aXNTVk5WZXJzaW9uMTZPck5ld2Vy KCkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNj cmlwdHMvVkNTVXRpbHMucG06CisgICAgICAgIChARVhQT1JUKTogQWRkZWQgJmlzU1ZOVmVyc2lv bjE2T3JOZXdlci4KKyAgICAgICAgKHN2blZlcnNpb24pOiBBZGRlZC4gIEludGVybmFsIG1ldGhv ZCB0aGF0IGdldHMgdGhlIFNWTiB2ZXJzaW9uCisgICAgICAgIGFuZCBjYWNoZXMgaXQuCisgICAg ICAgIChpc1NWTlZlcnNpb24xNk9yTmV3ZXIpOiBBZGRlZC4gIE1ldGhvZCB0aGF0IGRvZXMgdGhl IFNWTiAxLjYKKyAgICAgICAgdmVyc2lvbiBjaGVjay4KKyAgICAgICAgKiBTY3JpcHRzL3ByZXBh cmUtQ2hhbmdlTG9nOiBTd2l0Y2hlZCB0byB1c2UgbmV3CisgICAgICAgIGlzU1ZOVmVyc2lvbjE2 T3JOZXdlcigpIG1ldGhvZC4KKyAgICAgICAgKiBTY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9nczog RGl0dG8uCisgICAgICAgICogU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoOiBEaXR0by4KKworMjAw OS0wOS0wMSAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgorCiAgICAgICAgIENs ZWFuIHVwIFZDU1V0aWxzLnBtCiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtIGIvV2ViS2l0VG9v bHMvU2NyaXB0cy9WQ1NVdGlscy5wbQppbmRleCBhOGYwMzE0Li41MjIzYzkyIDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvVkNTVXRpbHMucG0KQEAgLTQ5LDYgKzQ5LDcgQEAgQkVHSU4gewogICAgICAgICAmaXNHaXRE aXJlY3RvcnkKICAgICAgICAgJmlzU1ZOCiAgICAgICAgICZpc1NWTkRpcmVjdG9yeQorICAgICAg ICAmaXNTVk5WZXJzaW9uMTZPck5ld2VyCiAgICAgICAgICZtYWtlRmlsZVBhdGhSZWxhdGl2ZQog ICAgICAgICAmcGF0aFJlbGF0aXZlVG9TVk5SZXBvc2l0b3J5Um9vdEZvclBhdGgKICAgICAgICAg JnN2blJldmlzaW9uRm9yRGlyZWN0b3J5CkBAIC02NCw2ICs2NSw3IEBAIG15ICRnaXRSb290Owog bXkgJGlzR2l0OwogbXkgJGlzR2l0QnJhbmNoQnVpbGQ7CiBteSAkaXNTVk47CitteSAkc3ZuVmVy c2lvbjsKIAogc3ViIGlzR2l0RGlyZWN0b3J5KCQpCiB7CkBAIC0xMjEsNiArMTIzLDI0IEBAIHN1 YiBpc1NWTigpCiAgICAgcmV0dXJuICRpc1NWTjsKIH0KIAorc3ViIHN2blZlcnNpb24oKQorewor ICAgIHJldHVybiAkc3ZuVmVyc2lvbiBpZiBkZWZpbmVkICRzdm5WZXJzaW9uOworCisgICAgaWYg KCFpc1NWTigpKSB7CisgICAgICAgICRzdm5WZXJzaW9uID0gMDsKKyAgICB9IGVsc2UgeworICAg ICAgICBjaG9tcCgkc3ZuVmVyc2lvbiA9IGBzdm4gLS12ZXJzaW9uIC0tcXVpZXRgKTsKKyAgICB9 CisgICAgcmV0dXJuICRzdm5WZXJzaW9uOworfQorCitzdWIgaXNTVk5WZXJzaW9uMTZPck5ld2Vy KCkKK3sKKyAgICBteSAkdmVyc2lvbiA9IHN2blZlcnNpb24oKTsKKyAgICByZXR1cm4gZXZhbCAi diR2ZXJzaW9uIiBnZSB2MS42OworfQorCiBzdWIgY2hkaXJSZXR1cm5pbmdSZWxhdGl2ZVBhdGgo JCkKIHsKICAgICBteSAoJGRpcmVjdG9yeSkgPSBAXzsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUt Q2hhbmdlTG9nCmluZGV4IDE5ODQyYmMuLjFmNzkwODEgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9wcmVw YXJlLUNoYW5nZUxvZwpAQCAtMTUxLDggKzE1MSw2IEBAICRpc1NWTiB8fCAkaXNHaXQgfHwgZGll ICJDb3VsZG4ndCBkZXRlcm1pbmUgeW91ciB2ZXJzaW9uIGNvbnRyb2wgc3lzdGVtLiI7CiBteSAk U1ZOID0gInN2biI7CiBteSAkR0lUID0gImdpdCI7CiAKLW15ICRzdm5WZXJzaW9uID0gYHN2biAt LXZlcnNpb24gLS1xdWlldGAgaWYgJGlzU1ZOOwotCiAjIEZpbmQgdGhlIGxpc3Qgb2YgbW9kaWZp ZWQgZmlsZXMKIG15IEBjaGFuZ2VkX2ZpbGVzOwogbXkgJGNoYW5nZWRfZmlsZXNfc3RyaW5nOwpA QCAtMTQzOCw3ICsxNDM2LDcgQEAgc3ViIGdlbmVyYXRlRmlsZUxpc3QoXEBcQFwlKQogCiAgICAg ICAgIGlmICgkaXNTVk4pIHsKICAgICAgICAgICAgIG15ICRtYXRjaGVzOwotICAgICAgICAgICAg aWYgKGV2YWwgInYkc3ZuVmVyc2lvbiIgZ2UgdjEuNikgeworICAgICAgICAgICAgaWYgKGlzU1ZO VmVyc2lvbjE2T3JOZXdlcigpKSB7CiAgICAgICAgICAgICAgICAgJG1hdGNoZXMgPSAvXihbIEFD RE1SXSkoWyBDTV0pLns1fSAoLis/KVtcclxuXSokLzsKICAgICAgICAgICAgICAgICAkc3RhdHVz ID0gJDE7CiAgICAgICAgICAgICAgICAgJHByb3BlcnR5U3RhdHVzID0gJDI7CmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9ncyBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzCmluZGV4IDBkMTM2Y2QuLmRiNDk3ZjkgMTAwNzU1Ci0t LSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzCisrKyBiL1dlYktpdFRv b2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dzCkBAIC02NCw4ICs2NCw2IEBAIG15ICRpc1NW TiA9IGlzU1ZOKCk7CiBteSAkU1ZOID0gInN2biI7CiBteSAkR0lUID0gImdpdCI7CiAKLW15ICRz dm5WZXJzaW9uID0gYHN2biAtLXZlcnNpb24gLS1xdWlldGAgaWYgJGlzU1ZOOwotCiBteSAkZml4 TWVyZ2VkOwogbXkgJGdpdFJlYmFzZUNvbnRpbnVlID0gMDsKIG15ICRwcmludFdhcm5pbmdzID0g MTsKQEAgLTI1Niw3ICsyNTQsNyBAQCBzdWIgZmluZFVubWVyZ2VkQ2hhbmdlTG9ncygpCiAgICAg ICAgIGlmICgkaXNTVk4pIHsKICAgICAgICAgICAgIG15ICRtYXRjaGVzOwogICAgICAgICAgICAg bXkgJGZpbGU7Ci0gICAgICAgICAgICBpZiAoZXZhbCAidiRzdm5WZXJzaW9uIiBnZSB2MS42KSB7 CisgICAgICAgICAgICBpZiAoaXNTVk5WZXJzaW9uMTZPck5ld2VyKCkpIHsKICAgICAgICAgICAg ICAgICAkbWF0Y2hlcyA9IC9eKFtDXSkuezZ9ICguKz8pW1xyXG5dKiQvOwogICAgICAgICAgICAg ICAgICRmaWxlID0gJDI7CiAgICAgICAgICAgICB9IGVsc2UgewpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4t Y3JlYXRlLXBhdGNoCmluZGV4IDZlNjExNjQuLmU5MWYwMGQgMTAwNzU1Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3N2 bi1jcmVhdGUtcGF0Y2gKQEAgLTc3LDcgKzc3LDYgQEAgc3ViIHRlc3RmaWxlY21wKCQkKTsKICRF TlZ7J0xDX0FMTCd9ID0gJ0MnOwogCiBteSAkc2hvd0hlbHA7Ci1teSAkc3ZuVmVyc2lvbiA9IGBz dm4gLS12ZXJzaW9uIC0tcXVpZXRgOwogbXkgJGRldk51bGwgPSBGaWxlOjpTcGVjLT5kZXZudWxs KCk7CiAKIG15ICRyZXN1bHQgPSBHZXRPcHRpb25zKApAQCAtMjkyLDcgKzI5MSw3IEBAIHN1YiBn ZW5lcmF0ZUZpbGVMaXN0KCRcJSkKICAgICAgICAgJGxpbmUgPX4gcy9bXHJcbl0rJC8vZzsKICAg ICAgICAgbXkgJHN0YXQ7CiAgICAgICAgIG15ICRwYXRoOwotICAgICAgICBpZiAoZXZhbCAidiRz dm5WZXJzaW9uIiBnZSB2MS42KSB7IAorICAgICAgICBpZiAoaXNTVk5WZXJzaW9uMTZPck5ld2Vy KCkpIHsKICAgICAgICAgICAgICRzdGF0ID0gc3Vic3RyKCRsaW5lLCAwLCA4KTsKICAgICAgICAg ICAgICRwYXRoID0gc3Vic3RyKCRsaW5lLCA4KTsKICAgICAgICAgfSBlbHNlIHs= 38906 2009-09-01 17:59:35 -0700 2009-09-02 00:21:45 -0700 With Subversion 1.6, update-webkit prompts on conflicts bug-27168-20090901175934.patch text/plain 1527 ddkilzer ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyZDI0MmU4Li4wMWMzOTllIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMDktMDkt MDEgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAorICAgICAgICA8aHR0cDov L3dlYmtpdC5vcmcvYi8yNzE2OD4gV2l0aCBTdWJ2ZXJzaW9uIDEuNiwgdXBkYXRlLXdlYmtpdCBw cm9tcHRzIG9uIGNvbmZsaWN0cworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0OiBBZGRlZCAiLS1hY2NlcHQgcG9z dHBvbmUiIHRvCisgICAgICAgIEBzdm5PcHRpb25zIHdoZW4gcnVubmluZyB3aXRoIHN2bi0xLjYg b3IgbmV3ZXIuCisKKzIwMDktMDktMDEgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNv bT4KKwogICAgICAgICBNb3ZlZCBzdm4gMS42IHZlcnNpb24gY2hlY2sgaW50byBWQ1NVdGlsczo6 aXNTVk5WZXJzaW9uMTZPck5ld2VyKCkKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdCBiL1dl YktpdFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdAppbmRleCA1YTg3YjA1Li42ZDc4ZDg4IDEw MDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0CkBAIC0xLDYgKzEsNiBAQAogIyEvdXNyL2Jpbi9w ZXJsIC13CiAKLSMgQ29weXJpZ2h0IChDKSAyMDA1LCAyMDA2LCAyMDA3LCAyMDA4IEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDA1LCAyMDA2LCAyMDA3 LCAyMDA4LCAyMDA5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucwpAQCAtMzQsNiArMzQsNyBAQCB1c2UgbGliICRGaW5kQmluOjpCaW47 CiB1c2UgRmlsZTo6QmFzZW5hbWU7CiB1c2UgRmlsZTo6U3BlYzsKIHVzZSBHZXRvcHQ6Okxvbmc7 Cit1c2UgVkNTVXRpbHM7CiB1c2Ugd2Via2l0ZGlyczsKIAogc3ViIHJ1blN2blVwZGF0ZSgpOwpA QCAtNTksNiArNjAsNyBAQCBfX0VORF9fCiAKIG15IEBzdm5PcHRpb25zID0gKCk7CiBwdXNoIEBz dm5PcHRpb25zLCAnLXEnIGlmICRxdWlldDsKK3B1c2ggQHN2bk9wdGlvbnMsIHF3KC0tYWNjZXB0 IHBvc3Rwb25lKSBpZiBpc1NWTlZlcnNpb24xNk9yTmV3ZXIoKTsKIAogY2hkaXJXZWJLaXQoKTsK IHByaW50ICJVcGRhdGluZyBPcGVuU291cmNlXG4iIHVubGVzcyAkcXVpZXQ7