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

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 682e5bfd1c69ec9f2154eccdae7a4e024e2b0abd
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 06:15:37 2010 +0000

    2010-12-02  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            Update the EWSTools scripts to use modern-style git repos
            https://bugs.webkit.org/show_bug.cgi?id=50402
    
            * EWSTools/create-webkit-git:
            * EWSTools/start-commit-queue.sh:
            * EWSTools/start-queue.sh:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73240 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d343d56..c880b01 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-02  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Update the EWSTools scripts to use modern-style git repos
+        https://bugs.webkit.org/show_bug.cgi?id=50402
+
+        * EWSTools/create-webkit-git:
+        * EWSTools/start-commit-queue.sh:
+        * EWSTools/start-queue.sh:
+
 2010-12-02  Simon Fraser  <simon.fraser at apple.com>
 
         Fix Chromium Linux plugin tests by not logging
diff --git a/WebKitTools/EWSTools/create-webkit-git b/WebKitTools/EWSTools/create-webkit-git
index 0088a47..cbf8ce4 100755
--- a/WebKitTools/EWSTools/create-webkit-git
+++ b/WebKitTools/EWSTools/create-webkit-git
@@ -27,10 +27,16 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# These are meant to match the instructions from:
+# http://trac.webkit.org/wiki/UsingGitWithWebKit
 cd /mnt/git
 git clone git://git.webkit.org/WebKit.git webkit
 cd webkit
+
 git svn init -T trunk http://svn.webkit.org/repository/webkit
 git update-ref refs/remotes/trunk origin/master
-git svn rebase
+# It's possible that this "config" step can get merged into an earlier setup step.
+git config --replace-all svn-remote.svn.fetch trunk:refs/remotes/origin/master
 
+git fetch
+git svn rebase
diff --git a/WebKitTools/EWSTools/start-commit-queue.sh b/WebKitTools/EWSTools/start-commit-queue.sh
index c55029a..25099a5 100755
--- a/WebKitTools/EWSTools/start-commit-queue.sh
+++ b/WebKitTools/EWSTools/start-commit-queue.sh
@@ -33,6 +33,7 @@ do
   git reset --hard trunk
   git clean -f
   git rebase --abort
+  git fetch
   git svn rebase
   ./WebKitTools/Scripts/webkit-patch commit-queue --no-confirm --exit-after-iteration 10
 done
diff --git a/WebKitTools/EWSTools/start-queue.sh b/WebKitTools/EWSTools/start-queue.sh
index 7835e74..1ddecde 100755
--- a/WebKitTools/EWSTools/start-queue.sh
+++ b/WebKitTools/EWSTools/start-queue.sh
@@ -32,6 +32,7 @@ while :
 do
   git reset --hard
   git clean -f
+  git fetch
   git svn rebase
   ./WebKitTools/Scripts/webkit-patch $1 --no-confirm --exit-after-iteration 10
 done

-- 
WebKit Debian packaging