Title: [209714] trunk/Tools
- Revision
- 209714
- Author
- [email protected]
- Date
- 2016-12-12 10:18:02 -0800 (Mon, 12 Dec 2016)
Log Message
ChangeLogs become readonly after resolving a conflict
https://bugs.webkit.org/show_bug.cgi?id=165440
rdar://problem/29491002
Reviewed by Darin Adler.
* Scripts/resolve-ChangeLogs: (resolveChangeLog): Set correct permissions when
moving the file.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (209713 => 209714)
--- trunk/Tools/ChangeLog 2016-12-12 18:17:38 UTC (rev 209713)
+++ trunk/Tools/ChangeLog 2016-12-12 18:18:02 UTC (rev 209714)
@@ -1,3 +1,14 @@
+2016-12-12 Alexey Proskuryakov <[email protected]>
+
+ ChangeLogs become readonly after resolving a conflict
+ https://bugs.webkit.org/show_bug.cgi?id=165440
+ rdar://problem/29491002
+
+ Reviewed by Darin Adler.
+
+ * Scripts/resolve-ChangeLogs: (resolveChangeLog): Set correct permissions when
+ moving the file.
+
2016-12-12 Filip Pizlo <[email protected]>
Re-enable collectContinuously since it doesn't crash anymore
Modified: trunk/Tools/Scripts/resolve-ChangeLogs (209713 => 209714)
--- trunk/Tools/Scripts/resolve-ChangeLogs 2016-12-12 18:17:38 UTC (rev 209713)
+++ trunk/Tools/Scripts/resolve-ChangeLogs 2016-12-12 18:18:02 UTC (rev 209714)
@@ -448,6 +448,7 @@
if (mergeChangeLogs($fileMine, $fileOlder, $fileNewer)) {
if ($file ne $fileNewer) {
+ chmod 0644, $fileNewer;
unlink($file);
rename($fileNewer, $file) or die $!;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
