Reviewers: hinoka, jarin,
Message:
Committed patchset #1 (id:1) manually as 23612 (presubmit successful).
Description:
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]
Committed: https://code.google.com/p/v8/source/detail?r=23612
Please review this at https://codereview.chromium.org/529883003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+2, -0 lines):
M tools/push-to-trunk/chromium_roll.py
M tools/push-to-trunk/test_scripts.py
Index: tools/push-to-trunk/chromium_roll.py
diff --git a/tools/push-to-trunk/chromium_roll.py
b/tools/push-to-trunk/chromium_roll.py
index
6d9e5bd8d81e91fbec543ff53b4c91e51ece4529..44d7f3157f94dbf76774a3113381846ba230d847
100755
--- a/tools/push-to-trunk/chromium_roll.py
+++ b/tools/push-to-trunk/chromium_roll.py
@@ -73,6 +73,7 @@ class UpdateChromiumCheckout(Step):
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"))
Index: tools/push-to-trunk/test_scripts.py
diff --git a/tools/push-to-trunk/test_scripts.py
b/tools/push-to-trunk/test_scripts.py
index
0755209ed1b2b1535432d050251ea3e62a03d10f..26adedab7773f2bfac89e1db131ca8cd34ca52f5
100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -860,6 +860,7 @@ def get_list():
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.
