[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4cec63dc7909157ee58ca095bd33e0c7377a25c3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 27 20:21:40 2010 +0000

    2010-09-27  Eric Seidel  <eric at webkit.org>
    
            Reviewed by James Robinson.
    
            start-commit-queue should abort any rebases in progress
            https://bugs.webkit.org/show_bug.cgi?id=46640
    
            webkit-patch commit-queue would do this itself, but this just
            helps ensure that the commit-queue script is properly updated
            before we run it (in the case where a previous rebase is in
            progress the git svn rebase would not work before we run the
            commit-queue).
    
            * EWSTools/start-commit-queue.sh:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ac3cc35..ebb481a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-27  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by James Robinson.
+
+        start-commit-queue should abort any rebases in progress
+        https://bugs.webkit.org/show_bug.cgi?id=46640
+
+        webkit-patch commit-queue would do this itself, but this just
+        helps ensure that the commit-queue script is properly updated
+        before we run it (in the case where a previous rebase is in
+        progress the git svn rebase would not work before we run the
+        commit-queue).
+
+        * EWSTools/start-commit-queue.sh:
+
 2010-09-18  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebKitTools/EWSTools/start-commit-queue.sh b/WebKitTools/EWSTools/start-commit-queue.sh
index 998300e..c55029a 100755
--- a/WebKitTools/EWSTools/start-commit-queue.sh
+++ b/WebKitTools/EWSTools/start-commit-queue.sh
@@ -30,8 +30,9 @@
 cd "$HOME/Projects/CommitQueue"
 while :
 do
-  git reset --hard
+  git reset --hard trunk
   git clean -f
+  git rebase --abort
   git svn rebase
   ./WebKitTools/Scripts/webkit-patch commit-queue --no-confirm --exit-after-iteration 10
 done

-- 
WebKit Debian packaging