15864 2007-11-06 19:02:18 -0800 Replace merge-changelog with resolve-ChangeLogs 2007-11-25 22:00:26 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.4 RESOLVED FIXED http://trac.webkit.org/projects/webkit/browser/trunk/WebKitTools/Scripts/merge-changelog P2 Normal --- 1 ddkilzer ddkilzer darin oldest_to_newest 60466 0 ddkilzer 2007-11-06 19:02:18 -0800 The merge-changelog script was more useful when svn-apply/svn-unapply didn't use --fuzz=3 when applying ChangeLog patches, or when applying a patch using good ol' patch(1). The resolve-ChangeLogs script should probably subsume the merge-changelog functionality, and then merge-changelog may go away. 62248 1 17496 ddkilzer 2007-11-24 20:17:35 -0800 Created attachment 17496 Patch v1 62336 2 17496 aroben 2007-11-25 17:44:46 -0800 Comment on attachment 17496 Patch v1 r=me 62348 3 ddkilzer 2007-11-25 22:00:26 -0800 Committed revision 28035. 17496 2007-11-24 20:17:35 -0800 2007-11-25 17:44:46 -0800 Patch v1 bug-15864-v1.diff text/plain 5763 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDI4MDExKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDctMTEtMjQgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQnVnIDE1ODY0OiBSZXBsYWNlIG1lcmdlLWNo YW5nZWxvZyB3aXRoIHJlc29sdmUtQ2hhbmdlTG9ncworICAgICAgICA8aHR0cDovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4NjQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUm9sbCBmdW5jdGlvbmFsaXR5IG9mIG1lcmdlLWNoYW5n ZWxvZyBpbnRvIHJlc29sdmUtQ2hhbmdlTG9ncworICAgICAgICBzY3JpcHQuICBUaGUgc2NyaXB0 IG5vdyBjaGVja3MgZm9yIENoYW5nZUxvZy5yZWogYW5kCisgICAgICAgIENoYW5nZUxvZy5vcmln IGZpbGVzIGZpcnN0LiAgSWYgaXQgZmluZHMgdGhlbSwgaXQgdXNlcyB0aGUKKyAgICAgICAgQ2hh bmdlTG9nLnJlaiBmaWxlIGFzIGEgcGF0Y2ggKGluIG9sZCBjb250ZXh0dWFsIGRpZmYgZm9ybWF0 KSB0bworICAgICAgICBhcHBseSB3aXRoIC0tZnV6ej0zLgorCisgICAgICAgICogU2NyaXB0cy9t ZXJnZS1jaGFuZ2Vsb2c6IFJlbW92ZWQuCisgICAgICAgICogU2NyaXB0cy9yZXNvbHZlLUNoYW5n ZUxvZ3M6IEhhbmRsZSB0cmFkaXRpb25hbCByZWplY3RlZCBwYXRjaGVzLgorCiAyMDA3LTExLTI0 ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZWQg ZW1wdHkgZGlyZWN0b3J5LgpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy9tZXJnZS1jaGFuZ2Vs b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9tZXJnZS1jaGFuZ2Vsb2cJKHJl dmlzaW9uIDI3OTk2KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy9tZXJnZS1jaGFuZ2Vsb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsNTkgKzAsMCBAQAotIyEvdXNyL2Jpbi9wZXJsIC13Ci0KLSMgQ29w eXJpZ2h0IChDKSAyMDA2IEFwcGxlIENvbXB1dGVyLCBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVk LgotIwotIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKLSMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0jIGFyZSBtZXQ6Ci0jCi0jIDEuICBSZWRp c3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdo dAotIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLiAKLSMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0 IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0jICAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0jICAgICBk b2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlz dHJpYnV0aW9uLiAKLSMgMy4gIE5laXRoZXIgdGhlIG5hbWUgb2YgQXBwbGUgQ29tcHV0ZXIsIElu Yy4gKCJBcHBsZSIpIG5vciB0aGUgbmFtZXMgb2YKLSMgICAgIGl0cyBjb250cmlidXRvcnMgbWF5 IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQKLSMgICAgIGZy b20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lv bi4gCi0jCi0jIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQU5EIElUUyBDT05U UklCVVRPUlMgIkFTIElTIiBBTkQgQU5ZCi0jIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVT LCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQKLSMgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NF IEFSRQotIyBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBPUiBJVFMgQ09OVFJJ QlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZCi0jIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUws IFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTCi0jIChJTkNMVURJ TkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBP UiBTRVJWSUNFUzsKLSMgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNT IElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5ECi0jIE9OIEFOWSBUSEVPUlkgT0YgTElB QklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0j IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRSBPRgotIyBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotCi11c2Ugc3RyaWN0OwotCi0jIHNjcmlwdCB0 byBtZXJnZSBjaGFuZ2UgbG9nIGFmdGVyIHN2bi1hcHBseSBmYWlsZWQKLSMKLSMgU2hvdWxkIGlt cHJvdmUgbGF0ZXIgdG8gbWVyZ2UgaW4gYWxsIHNvcnRzIG9mIG90aGVyIGNhc2VzIHRvby4KLQot b3BlbiBSRUcsICJDaGFuZ2VMb2cucmVqIiBvciBkaWUgIkNhbid0IG9wZW4gQ2hhbmdlTG9nLnJl alxuIjsKLW9wZW4gTE9HLCAiQ2hhbmdlTG9nIiBvciBkaWUgIkNhbid0IG9wZW4gQ2hhbmdlTG9n XG4iOwotCi1teSAkcmVzdWx0OwotCi13aGlsZSAoPFJFRz4pIHsKLSAgICAkcmVzdWx0IC49ICIk MVxuIiBpZiAvXlwrICguKikkLzsKLX0KLQotY2xvc2UgUkVHOwotCi1kaWUgIk5vdGhpbmcgaW4g Q2hhbmdlTG9nLnJlaiB0byBtZXJnZVxuIiB1bmxlc3MgJHJlc3VsdDsKLQotd2hpbGUgKDxMT0c+ KSB7Ci0gICAgJHJlc3VsdCAuPSAkXzsKLX0KLQotY2xvc2UgTE9HOwotCi1vcGVuIExPRywgIj5D aGFuZ2VMb2ciIG9yIGRpZSAiQ2FuJ3Qgd3JpdGUgQ2hhbmdlTG9nXG4iOwotcHJpbnQgTE9HICRy ZXN1bHQ7Ci1jbG9zZSBMT0c7Ci0KLXVubGluayAiQ2hhbmdlTG9nLnJlaiI7Ci11bmxpbmsgIkNo YW5nZUxvZy5vcmlnIjsKSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VM b2dzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VMb2dz CShyZXZpc2lvbiAyNzk5NikKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvcmVzb2x2ZS1DaGFuZ2VM b2dzCSh3b3JraW5nIGNvcHkpCkBAIC03OSw4ICs3OSwxMCBAQCBmb3IgbXkgJGZpbGUgKEBjaGFu Z2VMb2dGaWxlcykgewogICAgICAgICBuZXh0OwogICAgIH0KICAgICBpZiAobWVyZ2VDaGFuZ2Vz KCRmaWxlTWluZSwgJGZpbGVPbGRlciwgJGZpbGVOZXdlcikpIHsKLSAgICAgICAgdW5saW5rKCRm aWxlKTsKLSAgICAgICAgcmVuYW1lKCRmaWxlTmV3ZXIsICRmaWxlKSB8fCBkaWU7CisgICAgICAg IGlmICgkZmlsZSBuZSAkZmlsZU5ld2VyKSB7CisgICAgICAgICAgICB1bmxpbmsoJGZpbGUpOwor ICAgICAgICAgICAgcmVuYW1lKCRmaWxlTmV3ZXIsICRmaWxlKSB8fCBkaWU7CisgICAgICAgIH0K ICAgICAgICAgdW5saW5rKCRmaWxlTWluZSwgJGZpbGVPbGRlcik7CiAgICAgICAgIHJlc29sdmVD b25mbGljdCgkZmlsZSk7CiAgICAgICAgIHNob3dTdGF0dXMoJGZpbGUsIDEpOwpAQCAtMTAwLDYg KzEwMiwxMCBAQCBzdWIgY29uZmxpY3RGaWxlcygkKQogICAgIG15ICRmaWxlT2xkZXI7CiAgICAg bXkgJGZpbGVOZXdlcjsKIAorICAgIGlmICgtZSAkZmlsZSAmJiAtZSAiJGZpbGUub3JpZyIgJiYg LWUgIiRmaWxlLnJlaiIpIHsKKyAgICAgICAgcmV0dXJuICgiJGZpbGUucmVqIiwgIiRmaWxlLm9y aWciLCAkZmlsZSk7CisgICAgfQorCiAgICAgaWYgKGlzU1ZOKCkpIHsKICAgICAgICAgb3BlbiBT VEFULCAiLXwiLCAkU1ZOLCAic3RhdHVzIiwgJGZpbGUgfHwgZGllOwogICAgICAgICBteSAkc3Rh dHVzID0gPFNUQVQ+OwpAQCAtMjE1LDExICsyMjEsMjIgQEAgc3ViIG1lcmdlQ2hhbmdlcygkJCQp CiB7CiAgICAgbXkgKCRmaWxlTWluZSwgJGZpbGVPbGRlciwgJGZpbGVOZXdlcikgPSBAXzsKIAor ICAgIG15ICR0cmFkaXRpb25hbFJlamVjdCA9ICRmaWxlTWluZSA9fiAvXC5yZWokLyA/IDEgOiAw OworCiAgICAgbG9jYWwgJC8gPSB1bmRlZjsKIAotICAgIG9wZW4oRElGRiwgImRpZmYgLXUgJGZp bGVPbGRlciAkZmlsZU1pbmUgfCIpIHx8IGRpZTsKLSAgICBteSAkcGF0Y2ggPSA8RElGRj47Ci0g ICAgY2xvc2UoRElGRik7CisgICAgbXkgJHBhdGNoOworICAgIGlmICgkdHJhZGl0aW9uYWxSZWpl Y3QpIHsKKyAgICAgICAgb3BlbihESUZGLCAiPCIsICRmaWxlTWluZSk7CisgICAgICAgICRwYXRj aCA9IDxESUZGPjsKKyAgICAgICAgY2xvc2UoRElGRik7CisgICAgICAgIHJlbmFtZSgkZmlsZU1p bmUsICIkZmlsZU1pbmUuc2F2ZSIpOworICAgICAgICByZW5hbWUoJGZpbGVPbGRlciwgIiRmaWxl T2xkZXIuc2F2ZSIpOworICAgIH0gZWxzZSB7CisgICAgICAgIG9wZW4oRElGRiwgIi18IiwgcXco ZGlmZiAtdSksICRmaWxlT2xkZXIsICRmaWxlTWluZSkgfHwgZGllOworICAgICAgICAkcGF0Y2gg PSA8RElGRj47CisgICAgICAgIGNsb3NlKERJRkYpOworICAgIH0KIAogICAgIHVubGluaygiJHtm aWxlTmV3ZXJ9Lm9yaWciKTsKICAgICB1bmxpbmsoIiR7ZmlsZU5ld2VyfS5yZWoiKTsKQEAgLTIy OCwxNyArMjQ1LDI1IEBAIHN1YiBtZXJnZUNoYW5nZXMoJCQkKQogICAgIHByaW50IFBBVENIIGZp eENoYW5nZUxvZ1BhdGNoKCRwYXRjaCk7CiAgICAgY2xvc2UoUEFUQ0gpOwogCisgICAgbXkgJHJl c3VsdDsKKwogICAgICMgUmVmdXNlIHRvIG1lcmdlIHRoZSBwYXRjaCBpZiBpdCBkaWQgbm90IGFw cGx5IGNsZWFubHkKICAgICBpZiAoLWUgIiR7ZmlsZU5ld2VyfS5yZWoiKSB7CiAgICAgICAgIHVu bGluaygiJHtmaWxlTmV3ZXJ9LnJlaiIpOwogICAgICAgICB1bmxpbmsoJGZpbGVOZXdlcik7CiAg ICAgICAgIHJlbmFtZSgiJHtmaWxlTmV3ZXJ9Lm9yaWciLCAkZmlsZU5ld2VyKTsKLSAgICAgICAg cmV0dXJuIDA7CisgICAgICAgICRyZXN1bHQgPSAwOworICAgIH0gZWxzZSB7CisgICAgICAgIHVu bGluaygiJHtmaWxlTmV3ZXJ9Lm9yaWciKTsKKyAgICAgICAgJHJlc3VsdCA9IDE7CiAgICAgfQog Ci0gICAgdW5saW5rKCIke2ZpbGVOZXdlcn0ub3JpZyIpOworICAgIGlmICgkdHJhZGl0aW9uYWxS ZWplY3QpIHsKKyAgICAgICAgcmVuYW1lKCIkZmlsZU1pbmUuc2F2ZSIsICRmaWxlTWluZSk7Cisg ICAgICAgIHJlbmFtZSgiJGZpbGVPbGRlci5zYXZlIiwgJGZpbGVPbGRlcik7CisgICAgfQogCi0g ICAgcmV0dXJuIDE7CisgICAgcmV0dXJuICRyZXN1bHQ7CiB9CiAKIHN1YiByZXNvbHZlQ29uZmxp Y3QoJCkK