Title: [99996] trunk/Tools
- Revision
- 99996
- Author
- t...@chromium.org
- Date
- 2011-11-11 11:28:34 -0800 (Fri, 11 Nov 2011)
Log Message
Add --force to gclient sync. Once the cq bots cycle, we can remove
this since it slows down the normal sync.
* Scripts/update-webkit:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (99995 => 99996)
--- trunk/Tools/ChangeLog 2011-11-11 19:14:25 UTC (rev 99995)
+++ trunk/Tools/ChangeLog 2011-11-11 19:28:34 UTC (rev 99996)
@@ -1,3 +1,10 @@
+2011-11-11 Tony Chang <t...@chromium.org>
+
+ Add --force to gclient sync. Once the cq bots cycle, we can remove
+ this since it slows down the normal sync.
+
+ * Scripts/update-webkit:
+
2011-11-11 Marc-Antoine Ruel <mar...@chromium.org>
When --force is used, also use --reset
Modified: trunk/Tools/Scripts/update-webkit (99995 => 99996)
--- trunk/Tools/Scripts/update-webkit 2011-11-11 19:14:25 UTC (rev 99995)
+++ trunk/Tools/Scripts/update-webkit 2011-11-11 19:28:34 UTC (rev 99996)
@@ -106,7 +106,8 @@
rmtree(["WebKit/chromium/Debug", "WebKit/chromium/Release"]);
}
- my @chromiumUpdateArgs = ("perl", "Tools/Scripts/update-webkit-chromium");
+ # Temporarily add --force to unstick the commit queue.
+ my @chromiumUpdateArgs = ("perl", "Tools/Scripts/update-webkit-chromium", "--force");
push @chromiumUpdateArgs, "--chromium-android" if isChromiumAndroid();
system(@chromiumUpdateArgs) == 0 or die $!;
} elsif (isAppleWinWebKit()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes