[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 3c12f46bc7b8bca745bf15526007c2e1c7d311bb
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 3 23:34:08 2009 +0000

    2009-11-03  Eric Seidel  <eric at webkit.org>
    
            No review, just changing wording of log message.
    
            Change log string to say "failed" instead of "rejected"
            when a commit fails due to an out of date checkout.
            This makes grepping the commit-queue log for rejected patches easier.
    
            * Scripts/bugzilla-tool:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50488 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d42d510..9b5b5f9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,15 @@
 2009-11-03  Eric Seidel  <eric at webkit.org>
 
+        No review, just changing wording of log message.
+
+        Change log string to say "failed" instead of "rejected"
+        when a commit fails due to an out of date checkout.
+        This makes grepping the commit-queue log for rejected patches easier.
+
+        * Scripts/bugzilla-tool:
+
+2009-11-03  Eric Seidel  <eric at webkit.org>
+
         No review, adding commonly known committers missing from the file.
 
         * Scripts/modules/committers.py: Add committers found by looking at SVN records.
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index a4972af..f73d76d 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -347,7 +347,7 @@ class LandPatchesFromBugs(Command):
             if options.close_bug:
                 tool.bugs.close_bug_as_fixed(bug_id, "All reviewed patches have been landed.  Closing bug.")
         except CheckoutNeedsUpdate, e:
-            log("Commit was rejected because the checkout is out of date.  Please update and try again.")
+            log("Commit failed because the checkout is out of date.  Please update and try again.")
             log("You can pass --no-build to skip building/testing after update if you believe the new commits did not affect the results.")
             cls.handled_error(e)
         except ScriptError, e:

-- 
WebKit Debian packaging