9875 2006-07-12 08:59:22 -0700 Teach svn-apply and svn-unapply to use patch(1) for additions and deletions 2006-07-16 21:10:07 -0700 1 1 1 Unclassified WebKit Tools / Tests 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer darin oldest_to_newest 49439 0 ddkilzer 2006-07-12 08:59:22 -0700 The patch for Bug 9806 (attachment 9350) contained property changes for text files.  The svn-apply script doesn't handle these well since they get included in the file created!  The proper fix is to use the patch(1) command for additions and deletions of files, since it's smart enough to ignore the non-patch bits. Note that the "\No newline at end of file" markers are also being included at the end of text files because of this bug.  See r15232. I've got a patch to do this, but it needs a bit more testing first. 49441 1 ddkilzer 2006-07-12 09:01:23 -0700 For my next trick (a different bug), I will make svn-apply and svn-unapply use the property change information in such patches to update properties when fed patches. 49992 2 9473 ddkilzer 2006-07-15 20:07:22 -0700 Created attachment 9473 Patch v1 Most of the changes are self-explanitory. The worst code is for reversing a deletion. - We handle a local file existing (when one shouldn't) by renaming it to *.orig. - We unapply the deletion (which creates the file), but we rename it to a temp file name before running svn revert in case the contents are the same. - After we rename the temp file back to the original file name, we must work around a timestamp bug in Subversion where the svn client thinks the file hasn't change if its timestamp isn't sufficiently different. 49997 3 9474 ddkilzer 2006-07-15 21:06:58 -0700 Created attachment 9474 Patch to clean up "No newline" and "Property changes" droppings This patch cleans up the "No newline" and "Property changes" text in various files that should not have been included when files were checked in. 50089 4 9473 darin 2006-07-16 15:26:20 -0700 Comment on attachment 9473 Patch v1 Looks good. r=me 50117 5 ddkilzer 2006-07-16 21:10:07 -0700 Attachment 9473 (Patch v1) committed as revision 15477. Attachment 9474 (clean up) committed as revision 15478. 9473 2006-07-15 20:07:22 -0700 2006-07-16 15:26:20 -0700 Patch v1 bug-9875-v1.diff text/plain 8111 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE1NDY1KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDYtMDctMTUgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGtpbHplci5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgLSBmaXggaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVn LmNnaT9pZD05ODc1CisgICAgICAgICAgVGVhY2ggc3ZuLWFwcGx5IGFuZCBzdm4tdW5hcHBseSB0 byB1c2UgcGF0Y2goMSkgZm9yIGFkZGl0aW9ucyBhbmQgZGVsZXRpb25zCisKKyAgICAgICAgKiBT Y3JpcHRzL3N2bi1hcHBseToKKyAgICAgICAgKGFkZERpcmVjdG9yaWVzSWZOZWVkZWQpOiBEb24n dCB0cnkgdG8gYWRkIGEgZGlyZWN0b3J5IHRoYXQncyBhbHJlYWR5IGluIHN2bi4KKyAgICAgICAg KGNoZWNrc3VtKTogQWRkZWQuCisgICAgICAgIChwYXRjaCk6IFVzZSBwYXRjaCgxKSBmb3Igbm9u LWJpbmFyeSBhZGRpdGlvbnMgYW5kIGRlbGV0aW9ucy4KKyAgICAgICAgKiBTY3JpcHRzL3N2bi11 bmFwcGx5OgorICAgICAgICAoY2hlY2tzdW0pOiBBZGRlZC4KKyAgICAgICAgKHBhdGNoKTogVXNl IHBhdGNoKDEpIGZvciByZXZlcnRpbmcgbm9uLWJpbmFyeSBhZGRpdGlvbnMgYW5kIGRlbGV0aW9u cy4KKyAgICAgICAgKHJldmVydERpcmVjdG9yaWVzKTogRG9uJ3QgdHJ5IHRvIHJldmVydCBhIGRp cmVjdG9yeSB0aGF0IGhhc24ndCBjaGFuZ2VkIGluIHN2bi4KKwogMjAwNi0wNy0xMyAgTWFyayBS b3dlICA8b3BlbmRhcndpbi5vcmdAYmRhc2gubmV0Lm56PgogCiAgICAgICAgIFJldmlld2VkIGJ5 IFRpbW90aHkuCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQkocmV2aXNpb24gMTU0NjMpCisrKyBX ZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQkod29ya2luZyBjb3B5KQpAQCAtMzAsOSArMzAs OSBAQAogCiAjIERpZmZlcmVuY2VzIGZyb20gaW52b2tpbmcgInBhdGNoIC1wMCI6CiAjCi0jICAg SGFuZGxlcyBhZGRlZCBmaWxlcyAoZG9lcyBhIHN2biBhZGQpLgorIyAgIEhhbmRsZXMgYWRkZWQg ZmlsZXMgKGRvZXMgYSBzdm4gYWRkIHdpdGggbG9naWMgdG8gaGFuZGxlIGxvY2FsIGNoYW5nZXMp LgogIyAgIEhhbmRsZXMgYWRkZWQgZGlyZWN0b3JpZXMgKGRvZXMgYSBzdm4gYWRkKS4KLSMgICBI YW5kbGVzIHJlbW92ZWQgZmlsZXMgKGRvZXMgYSBzdm4gcm0pLgorIyAgIEhhbmRsZXMgcmVtb3Zl ZCBmaWxlcyAoZG9lcyBhIHN2biBybSB3aXRoIGxvZ2ljIHRvIGhhbmRsZSBsb2NhbCBjaGFuZ2Vz KS4KICMgICBIYW5kbGVzIHJlbW92ZWQgZGlyZWN0b3JpZXMtLXRob3NlIHdpdGggbm8gbW9yZSBm aWxlcyBvciBkaXJlY3RvcmllcyBsZWZ0IGluIHRoZW0KICMgICAgICAgKGRvZXMgYSBzdm4gcm0p LgogIyAgIEhhcyBtb2RlIHdoZXJlIGl0IHdpbGwgcm9sbCBiYWNrIHRvIHN2biB2ZXJzaW9uIG51 bWJlcnMgaW4gdGhlIHBhdGNoIGZpbGUgc28gc3ZuCkBAIC01Nyw2ICs1Nyw3IEBAIHVzZSBzdHJp Y3Q7CiB1c2Ugd2FybmluZ3M7CiAKIHVzZSBDd2Q7Cit1c2UgRGlnZXN0OjpNRDU7CiB1c2UgRmls ZTo6QmFzZW5hbWU7CiB1c2UgRmlsZTo6U3BlYzsKIHVzZSBHZXRvcHQ6Okxvbmc7CkBAIC02NSw2 ICs2Niw3IEBAIHVzZSBQT1NJWCBxdyhzdHJmdGltZSk7CiAKIHN1YiBhZGREaXJlY3Rvcmllc0lm TmVlZGVkKCQpOwogc3ViIGFwcGx5UGF0Y2goJCQ7JCk7CitzdWIgY2hlY2tzdW0oJCk7CiBzdWIg Zml4Q2hhbmdlTG9nUGF0Y2goJCk7CiBzdWIgaGFuZGxlQmluYXJ5Q2hhbmdlKCQkKTsKIHN1YiBp c0RpcmVjdG9yeUVtcHR5Rm9yUmVtb3ZhbCgkKTsKQEAgLTE1Myw3ICsxNTUsNyBAQCBzdWIgYWRk RGlyZWN0b3JpZXNJZk5lZWRlZCgkKQogICAgICAgICB9CiAgICAgICAgIGVsc2lmICgtZCAkZGly KSB7CiAgICAgICAgICAgICBteSAkc3ZuT3V0cHV0ID0gc3ZuU3RhdHVzKCRkaXIpOwotICAgICAg ICAgICAgaWYgKCRzdm5PdXRwdXQgJiYgc3Vic3RyKCRzdm5PdXRwdXQsIDAsIDEpIGVxICI/Iikg eworICAgICAgICAgICAgaWYgKCRzdm5PdXRwdXQgJiYgJHN2bk91dHB1dCA9fiBtI1w/XHMrJGRp clxuIykgewogICAgICAgICAgICAgICAgIHN5c3RlbSAic3ZuIiwgImFkZCIsICRkaXI7CiAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAkY2hlY2tlZERpcmVjdG9yaWVzeyRkaXJ9ID0gMTsKQEAg LTE3NCw2ICsxNzYsMTYgQEAgc3ViIGNoZWNrc3VtKCQpCiAgICAgY2xvc2UgUEFUQ0g7CiB9CiAK K3N1YiBjaGVja3N1bSgkKQoreworICAgIG15ICRmaWxlID0gc2hpZnQ7CisgICAgb3BlbihGSUxF LCAkZmlsZSkgb3IgZGllICJDYW4ndCBvcGVuICckZmlsZSc6ICQhIjsKKyAgICBiaW5tb2RlKEZJ TEUpOworICAgIG15ICRjaGVja3N1bSA9IERpZ2VzdDo6TUQ1LT5uZXctPmFkZGZpbGUoKkZJTEUp LT5oZXhkaWdlc3QoKTsKKyAgICBjbG9zZShGSUxFKTsKKyAgICByZXR1cm4gJGNoZWNrc3VtOwor fQorCiBzdWIgZml4Q2hhbmdlTG9nUGF0Y2goJCkKIHsKICAgICBteSAkcGF0Y2ggPSBzaGlmdDsK QEAgLTMwMCwyMyArMzEyLDE2IEBAIHN1YiBwYXRjaCgkKQogICAgICAgICAgICAgIyBCaW5hcnkg Y2hhbmdlCiAgICAgICAgICAgICBoYW5kbGVCaW5hcnlDaGFuZ2UoJGZ1bGxQYXRoLCAkcGF0Y2gp OwogICAgICAgICB9IGVsc2lmICgkZGVsZXRpb24pIHsKLSAgICAgICAgICAgICMgRGVsZXRpb24u Ci0gICAgICAgICAgICBzeXN0ZW0gInN2biIsICJybSIsICRmdWxsUGF0aDsKKyAgICAgICAgICAg ICMgRGVsZXRpb24KKyAgICAgICAgICAgIGFwcGx5UGF0Y2goJHBhdGNoLCAkZnVsbFBhdGgsIFsi LS1mb3JjZSJdKTsKKyAgICAgICAgICAgIHN5c3RlbSAic3ZuIiwgInJtIiwgIi0tZm9yY2UiLCAk ZnVsbFBhdGg7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAjIEFkZGl0aW9uLgotICAg ICAgICAgICAgbXkgJGNvbnRlbnRzID0gJHBhdGNoOwotICAgICAgICAgICAgaWYgKCRjb250ZW50 cyAhfiBzL14oLipcbikqQEBbXlxuXStAQFxuLy8pIHsKLSAgICAgICAgICAgICAgICAjIEVtcHR5 IGNvbnRlbnRzLgotICAgICAgICAgICAgICAgICRjb250ZW50cyA9ICIiOwotICAgICAgICAgICAg fSBlbHNlIHsKLSAgICAgICAgICAgICAgICAjIE5vbi1lbXB0eSBjb250ZW50czogUmVtb3ZlIGxl YWRpbmcgKyBzaWducy4KLSAgICAgICAgICAgICAgICAkY29udGVudHMgPX4gcy9eXCsvLzsKLSAg ICAgICAgICAgICAgICAkY29udGVudHMgPX4gcy9cblwrL1xuL2c7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgICAgICBvcGVuIEZJTEUsICI+IiwgJGZ1bGxQYXRoIG9yIGRpZTsKLSAgICAgICAgICAg IHByaW50IEZJTEUgJGNvbnRlbnRzOwotICAgICAgICAgICAgY2xvc2UgRklMRTsKKyAgICAgICAg ICAgICMgQWRkaXRpb24KKyAgICAgICAgICAgIHJlbmFtZSgkZnVsbFBhdGgsICIkZnVsbFBhdGgu b3JpZyIpIGlmIC1lICRmdWxsUGF0aDsKKyAgICAgICAgICAgIGFwcGx5UGF0Y2goJHBhdGNoLCAk ZnVsbFBhdGgpOworICAgICAgICAgICAgdW5saW5rKCIkZnVsbFBhdGgub3JpZyIpIGlmIC1lICIk ZnVsbFBhdGgub3JpZyIgJiYgY2hlY2tzdW0oJGZ1bGxQYXRoKSBlcSBjaGVja3N1bSgiJGZ1bGxQ YXRoLm9yaWciKTsKICAgICAgICAgICAgIHN5c3RlbSAic3ZuIiwgImFkZCIsICRmdWxsUGF0aDsK KyAgICAgICAgICAgIHN5c3RlbSAic3ZuIiwgInN0YXQiLCAiJGZ1bGxQYXRoLm9yaWciIGlmIC1l ICIkZnVsbFBhdGgub3JpZyI7CiAgICAgICAgIH0KICAgICB9CiB9CkluZGV4OiBXZWJLaXRUb29s cy9TY3JpcHRzL3N2bi11bmFwcGx5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMv c3ZuLXVuYXBwbHkJKHJldmlzaW9uIDE1NDYzKQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4t dW5hcHBseQkod29ya2luZyBjb3B5KQpAQCAtMzAsOSArMzAsOSBAQAogCiAjIERpZmZlcmVuY2Vz IGZyb20gaW52b2tpbmcgInBhdGNoIC1wMCAtUiI6CiAjCi0jICAgSGFuZGxlcyBhZGRlZCBmaWxl cyAoZG9lcyBhIHN2biBybSkuIAotIyAgIEhhbmRsZXMgYWRkZWQgZGlyZWN0b3JpZXMgKGRvZXMg YSBzdm4gcm0gYW5kIGEgcm1kaXIpLgotIyAgIEhhbmRsZXMgcmVtb3ZlZCBmaWxlcyAoZG9lcyBh IHN2biByZXZlcnQpLiAKKyMgICBIYW5kbGVzIGFkZGVkIGZpbGVzIChkb2VzIGEgc3ZuIHJldmVy dCB3aXRoIGFkZGl0aW9uYWwgbG9naWMgdG8gaGFuZGxlIGxvY2FsIGNoYW5nZXMpLiAKKyMgICBI YW5kbGVzIGFkZGVkIGRpcmVjdG9yaWVzIChkb2VzIGEgc3ZuIHJldmVydCBhbmQgYSBybWRpciku CisjICAgSGFuZGxlcyByZW1vdmVkIGZpbGVzIChkb2VzIGEgc3ZuIHJldmVydCB3aXRoIGFkZGl0 aW9uYWwgbG9naWMgdG8gaGFuZGxlIGxvY2FsIGNoYW5nZXMpLiAKICMgICBIYW5kbGVzIHJlbW92 ZWQgZGlyZWN0b3JpZXMgKGRvZXMgYSBzdm4gcmV2ZXJ0KS4gCiAjICAgUGF0aHMgZnJvbSBJbmRl eDogbGluZXMgYXJlIHVzZWQgcmF0aGVyIHRoYW4gdGhlIHBhdGhzIG9uIHRoZSBwYXRjaCBsaW5l cywgd2hpY2gKICMgICAgICAgbWFrZXMgcGF0Y2hlcyBnZW5lcmF0ZWQgYnkgImN2cyBkaWZmIiB3 b3JrIChpbmNyZWFzaW5nbHkgdW5pbXBvcnRhbnQgc2luY2Ugd2UKQEAgLTU1LDExICs1NSwxNCBA QCB1c2Ugc3RyaWN0OwogdXNlIHdhcm5pbmdzOwogCiB1c2UgQ3dkOwordXNlIERpZ2VzdDo6TUQ1 OwogdXNlIEZjbnRsIHF3KDpERUZBVUxUIDpzZWVrKTsKIHVzZSBGaWxlOjpCYXNlbmFtZTsKIHVz ZSBGaWxlOjpTcGVjOwordXNlIEZpbGU6OlRlbXAgcXcodGVtcGZpbGUpOwogdXNlIEdldG9wdDo6 TG9uZzsKIAorc3ViIGNoZWNrc3VtKCQpOwogc3ViIGZpeENoYW5nZUxvZ1BhdGNoKCQpOwogc3Vi IHBhdGNoKCQpOwogc3ViIHJldmVydERpcmVjdG9yaWVzKCk7CkBAIC0xMDMsNiArMTA2LDE2IEBA IHN1YiBjaGVja3N1bSgkKQogCiBleGl0IDA7CiAKK3N1YiBjaGVja3N1bSgkKQoreworICAgIG15 ICRmaWxlID0gc2hpZnQ7CisgICAgb3BlbihGSUxFLCAkZmlsZSkgb3IgZGllICJDYW4ndCBvcGVu ICckZmlsZSc6ICQhIjsKKyAgICBiaW5tb2RlKEZJTEUpOworICAgIG15ICRjaGVja3N1bSA9IERp Z2VzdDo6TUQ1LT5uZXctPmFkZGZpbGUoKkZJTEUpLT5oZXhkaWdlc3QoKTsKKyAgICBjbG9zZShG SUxFKTsKKyAgICByZXR1cm4gJGNoZWNrc3VtOworfQorCiBzdWIgZml4Q2hhbmdlTG9nUGF0Y2go JCkKIHsKICAgICBteSAkcGF0Y2ggPSBzaGlmdDsKQEAgLTE4MywxMSArMTk2LDQyIEBAIHN1YiBw YXRjaCgkKQogICAgIH0gZWxzZSB7CiAgICAgICAgICMgRWl0aGVyIGEgZGVsZXRpb24sIGFuIGFk ZGl0aW9uIG9yIGEgYmluYXJ5IGNoYW5nZS4KIAotICAgICAgICAjIFJldmVyc2UgY2hhbmdlIGJ5 IGRlbGV0aW5nIGN1cnJlbnQgY29weSBpZiBpdCBleGlzdHMgZmlyc3QKLSAgICAgICAgdW5saW5r KCRmdWxsUGF0aCkgaWYgKC1lICRmdWxsUGF0aCk7CisgICAgICAgIGlmICgkaXNCaW5hcnkpIHsK KyAgICAgICAgICAgICMgUmV2ZXJzZSBiaW5hcnkgY2hhbmdlCisgICAgICAgICAgICB1bmxpbmso JGZ1bGxQYXRoKSBpZiAoLWUgJGZ1bGxQYXRoKTsKKyAgICAgICAgICAgIHN5c3RlbSAic3ZuIiwg InJldmVydCIsICRmdWxsUGF0aDsKKyAgICAgICAgfSBlbHNpZiAoJGRlbGV0aW9uKSB7CisgICAg ICAgICAgICAjIFJldmVyc2UgZGVsZXRpb24KKyAgICAgICAgICAgIHJlbmFtZSgkZnVsbFBhdGgs ICIkZnVsbFBhdGgub3JpZyIpIGlmIC1lICRmdWxsUGF0aDsKKworICAgICAgICAgICAgdW5hcHBs eVBhdGNoKCRwYXRjaCwgJGZ1bGxQYXRoKTsKIAotICAgICAgICAjIFRoZW4gcnVuIHN2biByZXZl cnQKLSAgICAgICAgc3lzdGVtICJzdm4iLCAicmV2ZXJ0IiwgJGZ1bGxQYXRoOworICAgICAgICAg ICAgIyBJZiB3ZSBkb24ndCBhc2sgZm9yIHRoZSBmaWxlaGFuZGxlIGhlcmUsIHdlIGFsd2F5cyBn ZXQgYSB3YXJuaW5nLgorICAgICAgICAgICAgbXkgKCRmaCwgJHRlbXBQYXRoKSA9IHRlbXBmaWxl KGJhc2VuYW1lKCRmdWxsUGF0aCkgLiAiLVhYWFhYWFhYIiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBESVIgPT4gZGlybmFtZSgkZnVsbFBhdGgpLCBVTkxJTksg PT4gMSk7CisgICAgICAgICAgICBjbG9zZSgkZmgpOworCisgICAgICAgICAgICAjIEtlZXAgdGhl IHZlcnNpb24gZnJvbSB0aGUgcGF0Y2ggaW4gY2FzZSBpdCdzIGRpZmZlcmVudCBmcm9tIHN2bi4K KyAgICAgICAgICAgIHJlbmFtZSgkZnVsbFBhdGgsICR0ZW1wUGF0aCk7CisgICAgICAgICAgICBz eXN0ZW0gInN2biIsICJyZXZlcnQiLCAkZnVsbFBhdGg7CisgICAgICAgICAgICByZW5hbWUoJHRl bXBQYXRoLCAkZnVsbFBhdGgpOworCisgICAgICAgICAgICAjIFRoaXMgd29ya3MgYXJvdW5kIGEg YnVnIGluIHRoZSBzdm4gY2xpZW50LgorICAgICAgICAgICAgIyBbSXNzdWUgMTk2MF0gZmlsZSBt b2RpZmljYXRpb25zIGdldCBsb3N0IGR1ZSB0byBGQVQgMnMgdGltZSByZXNvbHV0aW9uCisgICAg ICAgICAgICAjIGh0dHA6Ly9zdWJ2ZXJzaW9uLnRpZ3Jpcy5vcmcvaXNzdWVzL3Nob3dfYnVnLmNn aT9pZD0xOTYwCisgICAgICAgICAgICBzeXN0ZW0gInRvdWNoIiwgJGZ1bGxQYXRoOworCisgICAg ICAgICAgICAjIFJlbW92ZSAkZnVsbFBhdGgub3JpZyBpZiBpdCBpcyB0aGUgc2FtZSBhcyAkZnVs bFBhdGgKKyAgICAgICAgICAgIHVubGluaygiJGZ1bGxQYXRoLm9yaWciKSBpZiAtZSAiJGZ1bGxQ YXRoLm9yaWciICYmIGNoZWNrc3VtKCRmdWxsUGF0aCkgZXEgY2hlY2tzdW0oIiRmdWxsUGF0aC5v cmlnIik7CisKKyAgICAgICAgICAgICMgU2hvdyBzdGF0dXMgaWYgdGhlIGZpbGUgaXMgbW9kaWZl ZAorICAgICAgICAgICAgc3lzdGVtICJzdm4iLCAic3RhdCIsICRmdWxsUGF0aDsKKyAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgICMgUmV2ZXJzZSBhZGRpdGlvbgorICAgICAgICAgICAgdW5h cHBseVBhdGNoKCRwYXRjaCwgJGZ1bGxQYXRoLCBbIi0tZm9yY2UiXSk7CisgICAgICAgICAgICB1 bmxpbmsoJGZ1bGxQYXRoKSBpZiAteiAkZnVsbFBhdGg7CisgICAgICAgICAgICBzeXN0ZW0gInN2 biIsICJyZXZlcnQiLCAkZnVsbFBhdGg7CisgICAgICAgIH0KICAgICB9CiB9CiAKQEAgLTIwMiwx MSArMjQ2LDExIEBAIHN1YiByZXZlcnREaXJlY3RvcmllcygpCiAgICAgICAgICAgICBuZXh0IGlm IChleGlzdHMgJGNoZWNrZWREaXJlY3Rvcmllc3skZGlyfSk7CiAgICAgICAgICAgICBpZiAoLWQg JGRpcikgewogICAgICAgICAgICAgICAgIG15ICRzdm5PdXRwdXQgPSBzdm5TdGF0dXMoJGRpcik7 Ci0gICAgICAgICAgICAgICAgaWYgKCRzdm5PdXRwdXQgJiYgc3Vic3RyKCRzdm5PdXRwdXQsIDAs IDEpIGVxICJBIikgeworICAgICAgICAgICAgICAgIGlmICgkc3ZuT3V0cHV0ICYmICRzdm5PdXRw dXQgPX4gbSNBXHMrJGRpclxuIykgewogICAgICAgICAgICAgICAgICAgIHN5c3RlbSAic3ZuIiwg InJldmVydCIsICRkaXI7CiAgICAgICAgICAgICAgICAgICAgcm1kaXIgJGRpcjsKICAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAgICAgZWxzaWYgKCRzdm5PdXRwdXQgJiYgc3Vic3RyKCRz dm5PdXRwdXQsIDAsIDEpIGVxICJEIikgeworICAgICAgICAgICAgICAgIGVsc2lmICgkc3ZuT3V0 cHV0ICYmICRzdm5PdXRwdXQgPX4gbSNEXHMrJGRpclxuIykgewogICAgICAgICAgICAgICAgICAg IHN5c3RlbSAic3ZuIiwgInJldmVydCIsICRkaXI7CiAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICAgIGVsc2Ugewo= 9474 2006-07-15 21:06:58 -0700 2006-07-16 15:25:29 -0700 Patch to clean up "No newline" and "Property changes" droppings bug-9875-clean-up.diff text/plain 4243 ddkilzer SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE1NDY1KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTAgQEAKKzIwMDYtMDctMTUgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGtpbHplci5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBmYXN0L2R5bmFtaWMvbW92ZS1ub2RlLXdpdGgtc2VsZWN0aW9uLWV4cGVj dGVkLmNoZWNrc3VtOgorICAgICAgICBSZW1vdmVkICJObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxl IiB0aGF0IHNudWNrIGluIGFzIHBhcnQgb2YgdGhlICJhcHBseSBwYXRjaCIgcHJvY2Vzcy4KKwog MjAwNi0wNy0xNSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgSm9obiBTdWxsaXZhbi4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZHluYW1pYy9t b3ZlLW5vZGUtd2l0aC1zZWxlY3Rpb24tZXhwZWN0ZWQuY2hlY2tzdW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvZmFzdC9keW5hbWljL21vdmUtbm9kZS13aXRoLXNlbGVjdGlvbi1leHBlY3Rl ZC5jaGVja3N1bQkocmV2aXNpb24gMTU0NjUpCisrKyBMYXlvdXRUZXN0cy9mYXN0L2R5bmFtaWMv bW92ZS1ub2RlLXdpdGgtc2VsZWN0aW9uLWV4cGVjdGVkLmNoZWNrc3VtCSh3b3JraW5nIGNvcHkp CkBAIC0xLDIgKzEgQEAKLTE5ZmU2MzNjMzE0MGQ2OGZjMWE3YjIyN2Q4OTYyMDA3Ci1cIE5vIG5l d2xpbmUgYXQgZW5kIG9mIGZpbGUKKzE5ZmU2MzNjMzE0MGQ2OGZjMWE3YjIyN2Q4OTYyMDA3Clwg Tm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDY1KQorKysgV2ViQ29yZS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAorMjAwNi0wNy0xNSAgRGF2 aWQgS2lsemVyICA8ZGRraWx6ZXJAa2lsemVyLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGRvbS9Ob2RlRmlsdGVyLmlkbDoKKyAgICAgICAg UmVtb3ZlZCAiTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZSIgdGhhdCBzbnVjayBpbiBhcyBwYXJ0 IG9mIHRoZSAiYXBwbHkgcGF0Y2giIHByb2Nlc3MuCisgICAgICAgICogbWFudWFsLXRlc3RzL2lu cHV0LWVtcHR5LW9uLWZvY3VzLmh0bWw6CisgICAgICAgIFJlbW92ZWQgIlByb3BlcnR5IGNoYW5n ZXMiIHRoYXQgc251Y2sgaW4gYXMgcGFydCBvZiB0aGUgImFwcGx5IHBhdGNoIiBwcm9jZXNzLgor CiAyMDA2LTA3LTE1ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICAt IGZpeCBtaXN0YWtlIGZyb20gZml4IGZvciA4OTUyIHRoYXQgd2FzIGJyZWFraW5nIGxheW91dCB0 ZXN0cwpJbmRleDogV2ViQ29yZS9kb20vTm9kZUZpbHRlci5pZGwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9kb20vTm9kZUZpbHRlci5pZGwJKHJldmlzaW9uIDE1NDY1KQorKysgV2ViQ29yZS9kb20v Tm9kZUZpbHRlci5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDQgKzQ0LDMgQEAgbW9kdWxlIHRy YXZlcnNhbCB7CiAgICAgfTsKICAgCiB9Ci1cIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKSW5k ZXg6IFdlYkNvcmUvbWFudWFsLXRlc3RzL2lucHV0LWVtcHR5LW9uLWZvY3VzLmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9tYW51YWwtdGVzdHMvaW5wdXQtZW1wdHktb24tZm9jdXMuaHRtbAko cmV2aXNpb24gMTU0NjUpCisrKyBXZWJDb3JlL21hbnVhbC10ZXN0cy9pbnB1dC1lbXB0eS1vbi1m b2N1cy5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC00LDExICs0LDMgQEAKIElmIHRoZSB0ZXN0IHN1 Y2NlZWRzIHRoZXJlIHdpbGwgYmUgbm8gY3Jhc2ggYW5kIHlvdSdsbCBlbmQgdXAgd2l0aCBhbiBl bXB0eSB0ZXh0IGZpZWxkIHdpdGggYSBibGlua2luZyBjYXJldC4KIEl0J3MgYXJndWFibHkgYSBi dWcgdGhhdCB0aGUgdGV4dCBmaWVsZCBhY2NlcHRzIGFuIGltYWdlIGF0IGFsbCwgc28gc29tZSBk YXkgd2UgbWlnaHQgZml4IHRoYXQgYW5kIG1ha2UgdGhpcwogdGVzdCBvYnNvbGV0ZS4gTWF5YmUg d2UgY2FuIGZpbmQgc29tZSBvdGhlciB3YXkgdG8gdGVzdCB0aGUgc2FtZSBjb2RlIHBhdGguPC9w PgotCi1Qcm9wZXJ0eSBjaGFuZ2VzIG9uOiBtYW51YWwtdGVzdHMvaW5wdXQtZW1wdHktb24tZm9j dXMuaHRtbAotX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwotTmFtZTogc3ZuOm1pbWUtdHlwZQotICAgKyB0ZXh0L2h0bWwK LU5hbWU6IHN2bjplb2wtc3R5bGUKLSAgICsgbmF0aXZlCi0KSW5kZXg6IFdlYktpdFRvb2xzL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1 NDY1KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTIgQEAKKzIwMDYtMDctMTUgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGtpbHplci5uZXQ+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9idWlsZGJvdC5jc3M6CisgICAgICAg IFJlbW92ZWQgIk5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUiIHRoYXQgc251Y2sgaW4gYXMgcGFy dCBvZiB0aGUgImFwcGx5IHBhdGNoIiBwcm9jZXNzLgorICAgICAgICAqIEdka0xhdW5jaGVyL21r OgorICAgICAgICBSZW1vdmVkICJQcm9wZXJ0eSBjaGFuZ2VzIiB0aGF0IHNudWNrIGluIGFzIHBh cnQgb2YgdGhlICJhcHBseSBwYXRjaCIgcHJvY2Vzcy4KKwogMjAwNi0wNy0xMyAgTWFyayBSb3dl ICA8b3BlbmRhcndpbi5vcmdAYmRhc2gubmV0Lm56PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRp bW90aHkuCkluZGV4OiBXZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9idWlsZGJvdC5jc3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvYnVpbGRib3QuY3NzCShyZXZpc2lv biAxNTQ2NSkKKysrIFdlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL2J1aWxkYm90LmNzcwkod29ya2luZyBjb3B5KQpAQCAtMTA2LDQgKzEwNiwzIEBA IHRkLmlkbGUsIHRkLndhaXRpbmcsIHRkLm9mZmxpbmUsIHRkLmJ1aWwKIHRkLlByb2plY3QgYTpo b3ZlciwgdGQuc3RhcnQgYTpob3ZlciB7CiAJY29sb3I6ICMwMDA7CiB9Ci1cIE5vIG5ld2xpbmUg YXQgZW5kIG9mIGZpbGUKSW5kZXg6IFdlYktpdFRvb2xzL0dka0xhdW5jaGVyL21rCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdFRvb2xzL0dka0xhdW5jaGVyL21rCShyZXZpc2lvbiAxNTQ2NSkKKysrIFdl YktpdFRvb2xzL0dka0xhdW5jaGVyL21rCSh3b3JraW5nIGNvcHkpCkBAIC0yLDkgKzIsMyBAQCBj ZCAuLi8uLi9XZWJDb3JlL1Byb2plY3RzL2dkawogbWFrZSAKIGNkIC0KIAotCi1Qcm9wZXJ0eSBj aGFuZ2VzIG9uOiBXZWJLaXRUb29scy9HZGtMYXVuY2hlci9tawotX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwotTmFtZTog c3ZuOmV4ZWN1dGFibGUKLSAgICsgKgotCg==