[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 783b9b7f1559363d327fe6a21f7600cb48186159
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 22:50:12 2010 +0000

    2010-11-30  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Tony Chang.
    
            update-webkit should call git fetch before git svn rebase
            https://bugs.webkit.org/show_bug.cgi?id=50273
    
            After discussion on webkit-dev, we've decided to move the "default"
            git setup to pulling updates from git.webkit.org in preference
            to rebuilding the local svn index using git svn fetch every time.
    
            This change should have no effect on people using the "old" git setup
            and should dramatically increase the speed of updates for those using
            the "new" git setup along with update-webkit.  I'm about to move the
            EWS and other queues over to this setup once this lands.
    
            * Scripts/update-webkit:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72966 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 775bbff..004ace2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-11-30  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Tony Chang.
+
+        update-webkit should call git fetch before git svn rebase
+        https://bugs.webkit.org/show_bug.cgi?id=50273
+
+        After discussion on webkit-dev, we've decided to move the "default"
+        git setup to pulling updates from git.webkit.org in preference
+        to rebuilding the local svn index using git svn fetch every time.
+
+        This change should have no effect on people using the "old" git setup
+        and should dramatically increase the speed of updates for those using
+        the "new" git setup along with update-webkit.  I'm about to move the
+        EWS and other queues over to this setup once this lands.
+
+        * Scripts/update-webkit:
+
 2010-11-30  Mario Sanchez Prada  <msanchez at igalia.com>
 
         Reviewed by Xan Lopez.
@@ -35,7 +53,7 @@
         Rebaseline server: baseline display tweaks
         https://bugs.webkit.org/show_bug.cgi?id=50207
         
-        Determine which baselines were used when running the tests and higlight
+        Determine which baselines were used when running the tests and highlight
         them in the UI. Sort platform names alphabetically.
         
         Also makes the server URL be launched in the user's browser
diff --git a/WebKitTools/Scripts/update-webkit b/WebKitTools/Scripts/update-webkit
index 3fc2efd..fd40dcd 100755
--- a/WebKitTools/Scripts/update-webkit
+++ b/WebKitTools/Scripts/update-webkit
@@ -126,5 +126,8 @@ sub runSvnUpdate()
 
 sub runGitUpdate()
 {
+    # Doing a git fetch first allows setups with svn-remote.svn.fetch = trunk:refs/remotes/origin/master
+    # to perform the rebase much much faster.
+    system("git", "fetch") == 0 or die;
     system("git", "svn", "rebase") == 0 or die;
 }

-- 
WebKit Debian packaging