Title: [122381] trunk/Tools
Revision
122381
Author
[email protected]
Date
2012-07-11 15:54:31 -0700 (Wed, 11 Jul 2012)

Log Message

The commit-queue needs some extra git config to be able to commit
https://bugs.webkit.org/show_bug.cgi?id=91025

Reviewed by Eric Seidel.

In order for the commit-queue to actually commit, it needs to know the
location of the SVN server.

* EWSTools/cold-boot.sh:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (122380 => 122381)


--- trunk/Tools/ChangeLog	2012-07-11 22:48:49 UTC (rev 122380)
+++ trunk/Tools/ChangeLog	2012-07-11 22:54:31 UTC (rev 122381)
@@ -1,5 +1,17 @@
 2012-07-11  Adam Barth  <[email protected]>
 
+        The commit-queue needs some extra git config to be able to commit
+        https://bugs.webkit.org/show_bug.cgi?id=91025
+
+        Reviewed by Eric Seidel.
+
+        In order for the commit-queue to actually commit, it needs to know the
+        location of the SVN server.
+
+        * EWSTools/cold-boot.sh:
+
+2012-07-11  Adam Barth  <[email protected]>
+
         Teach EWSTools how to configure SVN auth credentials
         https://bugs.webkit.org/show_bug.cgi?id=91021
 

Modified: trunk/Tools/EWSTools/cold-boot.sh (122380 => 122381)


--- trunk/Tools/EWSTools/cold-boot.sh	2012-07-11 22:48:49 UTC (rev 122380)
+++ trunk/Tools/EWSTools/cold-boot.sh	2012-07-11 22:54:31 UTC (rev 122381)
@@ -70,6 +70,19 @@
 	password = $4
 EOF
 
+if [[ $1 == "commit-queue" ]];then
+cat >> .git/config <<EOF
+[svn-remote "svn"]
+    url = ""
+    fetch = trunk:refs/remotes/origin/master
+[user]
+    email = [email protected]
+    name = Commit Queue
+[merge "changelog"]
+    driver = perl $PWD/Tools/Scripts/resolve-ChangeLogs --merge-driver %O %B %A
+EOF
+fi
+
 cd ~/tools
 echo "screen -t kr ./start-queue.sh" $1 $2 > screen-config
 bash boot.sh
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to