Title: [124128] trunk/Tools
- Revision
- 124128
- Author
- [email protected]
- Date
- 2012-07-30 17:49:39 -0700 (Mon, 30 Jul 2012)
Log Message
commit-queue is corrupting ChangeLogs
https://bugs.webkit.org/show_bug.cgi?id=92681
Reviewed by Tony Chang.
Some commits made with the commit-queue are ending up with duplicate
ChangeLog entries. I've hot-patched the servers to not use a special
merge driver for ChangeLogs, which should fix this issue. This patch
removes the merge driver from our cold-boot.sh script so that we won't
use it on new commit-queue instances.
* EWSTools/cold-boot.sh:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (124127 => 124128)
--- trunk/Tools/ChangeLog 2012-07-31 00:48:15 UTC (rev 124127)
+++ trunk/Tools/ChangeLog 2012-07-31 00:49:39 UTC (rev 124128)
@@ -1,3 +1,18 @@
+2012-07-30 Adam Barth <[email protected]>
+
+ commit-queue is corrupting ChangeLogs
+ https://bugs.webkit.org/show_bug.cgi?id=92681
+
+ Reviewed by Tony Chang.
+
+ Some commits made with the commit-queue are ending up with duplicate
+ ChangeLog entries. I've hot-patched the servers to not use a special
+ merge driver for ChangeLogs, which should fix this issue. This patch
+ removes the merge driver from our cold-boot.sh script so that we won't
+ use it on new commit-queue instances.
+
+ * EWSTools/cold-boot.sh:
+
2012-07-28 Sam Weinig <[email protected]>
Add ability to load from a string to the ObjC WK API
Modified: trunk/Tools/EWSTools/cold-boot.sh (124127 => 124128)
--- trunk/Tools/EWSTools/cold-boot.sh 2012-07-31 00:48:15 UTC (rev 124127)
+++ trunk/Tools/EWSTools/cold-boot.sh 2012-07-31 00:49:39 UTC (rev 124128)
@@ -78,8 +78,6 @@
[user]
email = [email protected]
name = Commit Queue
-[merge "changelog"]
- driver = perl $PWD/Tools/Scripts/resolve-ChangeLogs --merge-driver %O %B %A
EOF
fi
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
