165440 2016-12-05 17:05:08 -0800 ChangeLogs become readonly after resolving a conflict 2016-12-12 10:18:39 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap commit-queue dbates ddkilzer lforschler oldest_to_newest 1256613 0 ap 2016-12-05 17:05:08 -0800 When update-webkit or resolve-ChangeLogs resolves a conflict in a ChangeLog, the file becomes read-only. This looks like a change between svn 1.5 and svn 1.7 - "older" and "newer" files that are created on conflict are read-only, and one of these becomes the resolved file. <rdar://problem/29491002> 1256616 1 296224 ap 2016-12-05 17:10:34 -0800 Created attachment 296224 naive fix It seems good enough to just use 0644 - I don't think that we need to preserve other bits here. I'm somewhat confused about how merging works on a read-only file up to this point, but it does. Perhaps the patch tool doesn't care about permissions when they can be automagically adjusted while patching? 1256696 2 296224 ddkilzer 2016-12-05 20:15:43 -0800 Comment on attachment 296224 naive fix View in context: https://bugs.webkit.org/attachment.cgi?id=296224&action=review > Tools/Scripts/resolve-ChangeLogs:451 > + chmod 0644, $fileNewer; This won't work well when applying a patch to a script that has execute (+x) permissions. Does Perl have a way to say, "chmod a+w" instead? Or does svn has a command-line switch to restore its previous behavior? 1256717 3 ap 2016-12-05 20:53:09 -0800 As this is resolve-ChangeLogs scripts, I assume that it won't be used to resolve conflicts in scripts. I didn't find such a switch for svn (nor any discussion of why the change was made). 1258947 4 296224 darin 2016-12-11 18:40:50 -0800 Comment on attachment 296224 naive fix View in context: https://bugs.webkit.org/attachment.cgi?id=296224&action=review I guess this is OK. I have suggestions though. >> Tools/Scripts/resolve-ChangeLogs:451 >> + chmod 0644, $fileNewer; > > This won't work well when applying a patch to a script that has execute (+x) permissions. > > Does Perl have a way to say, "chmod a+w" instead? > > Or does svn has a command-line switch to restore its previous behavior? I looked on the web a bit and I think this is a better version: chmod ((stat($file))[2] & 0777), $fileNewer; It tries to transfer the permissions the old file had, not including exotic permissions like setuid. Another way to do it is to simple read $fileNewer and overwrite the contents of $file and then unlink $fileNewer instead of $file. That code would not be hard to write. 1259102 5 296224 commit-queue 2016-12-12 10:18:35 -0800 Comment on attachment 296224 naive fix Clearing flags on attachment: 296224 Committed r209714: <http://trac.webkit.org/changeset/209714> 1259103 6 commit-queue 2016-12-12 10:18:39 -0800 All reviewed patches have been landed. Closing bug. 296224 2016-12-05 17:10:34 -0800 2016-12-12 10:18:35 -0800 naive fix ReadOnly.txt text/plain 1126 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIwOTM2OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE2LTEyLTA1ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIENoYW5nZUxvZ3MgYmVjb21lIHJlYWRvbmx5IGFmdGVyIHJlc29sdmluZyBh IGNvbmZsaWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNjU0NDAKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjk0OTEwMDIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvcmVzb2x2ZS1DaGFu Z2VMb2dzOiAocmVzb2x2ZUNoYW5nZUxvZyk6IFNldCBjb3JyZWN0IHBlcm1pc3Npb25zIHdoZW4K KyAgICAgICAgbW92aW5nIHRoZSBmaWxlLgorCiAyMDE2LTEyLTA1ICBEZWFuIEphY2tzb24gIDxk aW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBwb2ludGVyIGxvY2sgbmVlZHMgdG8gYmUgZmVhdHVy ZSBkZXRlY3RhYmxlCkluZGV4OiBUb29scy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9ncwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3Jlc29sdmUtQ2hhbmdlTG9ncwkocmV2aXNpb24gMjA5 MzY2KQorKysgVG9vbHMvU2NyaXB0cy9yZXNvbHZlLUNoYW5nZUxvZ3MJKHdvcmtpbmcgY29weSkK QEAgLTQ0OCw2ICs0NDgsNyBAQCBzdWIgcmVzb2x2ZUNoYW5nZUxvZygkKQogCiAgICAgaWYgKG1l cmdlQ2hhbmdlTG9ncygkZmlsZU1pbmUsICRmaWxlT2xkZXIsICRmaWxlTmV3ZXIpKSB7CiAgICAg ICAgIGlmICgkZmlsZSBuZSAkZmlsZU5ld2VyKSB7CisgICAgICAgICAgICBjaG1vZCAwNjQ0LCAk ZmlsZU5ld2VyOwogICAgICAgICAgICAgdW5saW5rKCRmaWxlKTsKICAgICAgICAgICAgIHJlbmFt ZSgkZmlsZU5ld2VyLCAkZmlsZSkgb3IgZGllICQhOwogICAgICAgICB9Cg==