Revision: 22546
Author: [email protected]
Date: Wed Jul 23 09:25:36 2014 UTC
Log: Fix version check in push-to-trunk.
The local master branch is not kept up-to-date by the script.
BUG=
[email protected]
Review URL: https://codereview.chromium.org/411593003
http://code.google.com/p/v8/source/detail?r=22546
Modified:
/branches/bleeding_edge/tools/push-to-trunk/push_to_trunk.py
/branches/bleeding_edge/tools/push-to-trunk/test_scripts.py
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/push_to_trunk.py Mon Jul 21
12:13:36 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/push_to_trunk.py Wed Jul 23
09:25:36 2014 UTC
@@ -154,7 +154,7 @@
if SortingKey(self["trunk_version"]) <
SortingKey(self["latest_version"]):
# If the version on bleeding_edge is newer than on trunk, use it.
- self.GitCheckoutFile(self.Config(VERSION_FILE), "master")
+ self.GitCheckoutFile(self.Config(VERSION_FILE), "svn/bleeding_edge")
self.ReadAndPersistVersion()
if self.Confirm(("Automatically increment BUILD_NUMBER? (Saying 'n'
will "
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Mon Jul 21
12:13:36 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Wed Jul 23
09:25:36 2014 UTC
@@ -616,8 +616,8 @@
self.ExpectGit([
Git("checkout -f hash1 -- %s" % TEST_CONFIG[VERSION_FILE], ""),
- Git("checkout -f master -- %s" % TEST_CONFIG[VERSION_FILE], "",
- cb=lambda: self.WriteFakeVersionFile(22, 6)),
+ Git("checkout -f svn/bleeding_edge -- %s" %
TEST_CONFIG[VERSION_FILE],
+ "", cb=lambda: self.WriteFakeVersionFile(22, 6)),
])
self.ExpectReadline([
--
--
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.
