21850 2008-10-23 21:41:53 -0700 svn-apply and svn-unapply should preserve patch line endings 2020-12-01 10:21:20 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 ddkilzer ddkilzer aroben darin mrowe rbuis webkit-bug-importer oldest_to_newest 96483 0 ddkilzer 2008-10-23 21:41:53 -0700 * SUMMARY When applying (or unapplying) a patch, svn-apply and svn-unapply will remove all "native" line endings from a patch, and replace then with "\n". This causes problems when a patch contains more than one type of line ending (such as changes to a *.vcproj file and a *.pbxproj file in the same patch). * STEPS TO REPRODUCE 0. On a Mac OS X system. 1. Make changes to *.pbxproj and *.vcproj files. 2. Use svn-create-patch to create a patch of the changes. 3. Use svn-unapply to revert the changes using the patch file. 3a. Alternatively, use svn revert to back out the changes, then use svn-apply with the patch file. * RESULTS The svn-unapply or svn-apply operation will fail because the "native" line endings in the patch are currently stripped by the scripts. * NOTES Instead, both scripts should preserve the line endings for each patch, since the patch(1) command knows how to deal with them anyway. 96484 1 24634 ddkilzer 2008-10-23 21:58:25 -0700 Created attachment 24634 Patch v1 Proposed fix. 96507 2 24634 aroben 2008-10-24 07:30:53 -0700 Comment on attachment 24634 Patch v1 r=me 96529 3 ddkilzer 2008-10-24 11:20:16 -0700 $ svn commit WebKitTools Sending WebKitTools/ChangeLog Sending WebKitTools/Scripts/svn-apply Sending WebKitTools/Scripts/svn-unapply Transmitting file data ... Committed revision 37847. http://trac.webkit.org/changeset/37847 1705594 4 rbuis 2020-11-08 11:04:54 -0800 Reopening to attach new patch. 1705595 5 413543 rbuis 2020-11-08 11:04:57 -0800 Created attachment 413543 Patch 1705597 6 rbuis 2020-11-08 11:29:18 -0800 Uploaded to wrong bug... 1711088 7 webkit-bug-importer 2020-12-01 10:21:20 -0800 <rdar://problem/71856103> 24634 2008-10-23 21:58:25 -0700 2020-11-08 11:04:47 -0800 Patch v1 bug-21850-v1.diff text/plain 1946 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDM3ODM5KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDgtMTAtMjMgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBCdWcgMjE4NTA6IHN2bi1hcHBseSBhbmQgc3Zu LXVuYXBwbHkgc2hvdWxkIHByZXNlcnZlIHBhdGNoIGxpbmUgZW5kaW5ncworCisgICAgICAgIDxo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE4NTA+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3N2bi1hcHBs eTogU2F2ZSBlbmQtb2YtbGluZSBjaGFyYWN0ZXJzIHdoZW4gc3RyaXBwaW5nIHRoZW0KKyAgICAg ICAgb2ZmIGVhY2ggbGluZSBvZiBhIHBhdGNoIHNvIHRoYXQgdGhleSBtYXkgYmUgcmVzdG9yZWQg YWZ0ZXIKKyAgICAgICAgcHJvY2Vzc2luZyB0aGUgbGluZS4KKyAgICAgICAgKiBTY3JpcHRzL3N2 bi11bmFwcGx5OiBEaXR0by4KKwogMjAwOC0xMC0yMyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJA YXBwbGUuY29tPgogCiAgICAgICAgIEJ1ZyAyMTgzMjogRml4IHNjcmlwdHMgdXNpbmcgJ25ldyBG aWxlOjpUZW1wJyBmb3IgUGVybCA1LjEwCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3N2bi1h cHBseQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQkocmV2aXNp b24gMzc4MzMpCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL3N2bi1hcHBseQkod29ya2luZyBjb3B5 KQpAQCAtMTA3LDggKzEwNyw4IEBAIG15ICRmaWx0ZXI7CiBteSAkaW5kZXhQYXRoOwogbXkgJHBh dGNoOwogd2hpbGUgKDw+KSB7Ci0gICAgcy9cci8vZzsKLSAgICBjaG9tcDsKKyAgICBzLyhbXG5c cl0rKSQvL21nOworICAgIG15ICRlb2wgPSAkMTsKICAgICBpZiAoIWRlZmluZWQoJGluZGV4UGF0 aCkgJiYgbSNeZGlmZiAtLWdpdCBhLyMpIHsKICAgICAgICAgJGZpbHRlciA9IFwmZ2l0ZGlmZjJz dm5kaWZmOwogICAgIH0KQEAgLTE0MCw3ICsxNDAsNyBAQCB3aGlsZSAoPD4pIHsKICAgICAgICAg fQogICAgIH0KICAgICAkcGF0Y2ggLj0gJF87Ci0gICAgJHBhdGNoIC49ICJcbiI7CisgICAgJHBh dGNoIC49ICRlb2w7CiB9CiAKIGlmICgkcGF0Y2ggJiYgISRjb3BpZWRGcm9tUGF0aCkgewpJbmRl eDogV2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4tdW5hcHBseQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRU b29scy9TY3JpcHRzL3N2bi11bmFwcGx5CShyZXZpc2lvbiAzNzgzMykKKysrIFdlYktpdFRvb2xz L1NjcmlwdHMvc3ZuLXVuYXBwbHkJKHdvcmtpbmcgY29weSkKQEAgLTg4LDggKzg4LDggQEAgbXkg JGZpbHRlcjsKIG15ICRpbmRleFBhdGg7CiBteSAkcGF0Y2g7CiB3aGlsZSAoPD4pIHsKLSAgICBz L1xyLy9nOwotICAgIGNob21wOworICAgIHMvKFtcblxyXSspJC8vbWc7CisgICAgbXkgJGVvbCA9 ICQxOwogICAgIGlmICghZGVmaW5lZCgkaW5kZXhQYXRoKSAmJiBtI15kaWZmIC0tZ2l0IGEvIykg ewogICAgICAgICAkZmlsdGVyID0gXCZnaXRkaWZmMnN2bmRpZmY7CiAgICAgfQpAQCAtMTE3LDcg KzExNyw3IEBAIHdoaWxlICg8PikgewogICAgICAgICB9CiAgICAgfQogICAgICRwYXRjaCAuPSAk XzsKLSAgICAkcGF0Y2ggLj0gIlxuIjsKKyAgICAkcGF0Y2ggLj0gJGVvbDsKIH0KIAogaWYgKCRw YXRjaCkgewo= 413543 2020-11-08 11:04:57 -0800 2020-11-08 11:04:57 -0800 Patch bug-21850-20201108200455.patch text/plain 1929 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NTY3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNzk1NzRkYzllYWJiN2I4MDBjMjc1 MDViYjkzZmI3YTA2Zjc2MzBhMi4uN2EwZWI4OGY2N2NkMWIwZDdiMTgzOTk5Y2FhMDc1MjcyYzBm NzQ4YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTExLTA4ICBSb2IgQnVpcyAgPHJidWlz QGlnYWxpYS5jb20+CisKKyAgICAgICAgQWRkIHRlc3RjYXNlIGZvciByMjY5NTM4CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg1MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEkgZm9yZ290IHRvIGFkZCBh IHRlc3RjYXNlIGluIHIyNjk1MzguCisKKyAgICAgICAgKiBmYXN0L2Nzcy9tYXJxdWVlLXdpdGgt bGF5ZXItZGlzcGxheS1pbmxpbmUtY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBmYXN0L2Nzcy9tYXJxdWVlLXdpdGgtbGF5ZXItZGlzcGxheS1pbmxpbmUtY3Jhc2guaHRtbDog QWRkZWQuCisKIDIwMjAtMTEtMDggIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAg ICAgICBBZGQgdGVzdGNhc2UgZm9yIHIyNjk1MzcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvY3NzL21hcnF1ZWUtd2l0aC1sYXllci1kaXNwbGF5LWlubGluZS1jcmFzaC1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9tYXJxdWVlLXdpdGgtbGF5ZXItZGlzcGxheS1pbmxp bmUtY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhiZjRhZTRiYjE5ODgzNWQ2MWJhYTg4 MDhmMTcyNzU5YjhlNDBjODQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9tYXJxdWVlLXdpdGgtbGF5ZXItZGlzcGxheS1pbmxpbmUtY3Jhc2gtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMiBAQAorCitUaGUgdGVzdCBwYXNzZXMgaWYgV2ViS2l0IGRvZXNuJ3QgY3Jhc2gg b3IgaGl0IGFuIGFzc2VydGlvbi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL21h cnF1ZWUtd2l0aC1sYXllci1kaXNwbGF5LWlubGluZS1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9jc3MvbWFycXVlZS13aXRoLWxheWVyLWRpc3BsYXktaW5saW5lLWNyYXNoLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uZTMwY2M1ZWJhZDAzOGIwMGFiMGI5YzYwYzg5NTM5NDc1MDgzMzBiYgotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL21hcnF1ZWUtd2l0aC1sYXllci1kaXNw bGF5LWlubGluZS1jcmFzaC5odG1sCkBAIC0wLDAgKzEsMTUgQEAKKzwhRE9DVFlQRSBodG1sPgor PHN0eWxlPgorbWFycXVlZSB7IC13ZWJraXQtY2xpcC1wYXRoOiB1cmwoI2Zvbyk7IH0KKzwvc3R5 bGU+Cis8c2NyaXB0PgorZnVuY3Rpb24gcnVuVGVzdCgpIHsKK2lmICh3aW5kb3cudGVzdFJ1bm5l cikKKyAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKK2RvY3VtZW50LmdldEVsZW1lbnRzQnlU YWdOYW1lKCdtYXJxdWVlJylbMF0uc3R5bGUuY3NzVGV4dCA9ICJkaXNwbGF5OiBpbmxpbmUiOwor fQorPC9zY3JpcHQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8aWZyYW1lIHNyY2RvYz0i YmFyIj48L2lmcmFtZT4KKzxtYXJxdWVlPjwvbWFycXVlZT4KKzxwPlRoZSB0ZXN0IHBhc3NlcyBp ZiBXZWJLaXQgZG9lc24ndCBjcmFzaCBvciBoaXQgYW4gYXNzZXJ0aW9uLjwvcD4K