ChangeLogs become readonly after resolving a conflict
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Dec 2016 18:18:02 +0000 (18:18 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Dec 2016 18:18:02 +0000 (18:18 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@209714 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/resolve-ChangeLogs

index bcfb1e2..b3bbb84 100644 (file)
@@ -1,3 +1,14 @@
+2016-12-12  Alexey Proskuryakov  <ap@apple.com>
+
+        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  <fpizlo@apple.com>
 
         Re-enable collectContinuously since it doesn't crash anymore
index aad731a..65ae5e0 100755 (executable)
@@ -448,6 +448,7 @@ sub resolveChangeLog($)
 
     if (mergeChangeLogs($fileMine, $fileOlder, $fileNewer)) {
         if ($file ne $fileNewer) {
+            chmod 0644, $fileNewer;
             unlink($file);
             rename($fileNewer, $file) or die $!;
         }