Revision: 23612
Author: [email protected]
Date: Tue Sep 2 12:56:07 2014 UTC
Log: Fix chromium update in chromium roll script.
Needs an extra 'git pull' after a gclient sync, because the solution is
unmanaged now.
[email protected],[email protected]
Review URL: https://codereview.chromium.org/529883003
https://code.google.com/p/v8/source/detail?r=23612
Modified:
/branches/bleeding_edge/tools/push-to-trunk/chromium_roll.py
/branches/bleeding_edge/tools/push-to-trunk/test_scripts.py
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/chromium_roll.py Wed Aug 27
13:13:40 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/chromium_roll.py Tue Sep 2
12:56:07 2014 UTC
@@ -73,6 +73,7 @@
os.chdir(self["chrome_path"])
self.GitCheckout("master")
self._side_effect_handler.Command("gclient", "sync --nohooks")
+ self.GitPull()
try:
# TODO(machenbach): Add cwd to git calls.
os.chdir(os.path.join(self["chrome_path"], "v8"))
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Tue Sep 2
12:51:30 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Tue Sep 2
12:56:07 2014 UTC
@@ -860,6 +860,7 @@
Cmd("git status -s -uno", ""),
Cmd("git checkout -f master", ""),
Cmd("gclient sync --nohooks", "syncing..."),
+ Cmd("git pull", ""),
Cmd("git fetch origin", ""),
Cmd("git checkout -b v8-roll-123455", ""),
Cmd("roll-dep v8 123455", "rolled", cb=WriteDeps),
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
