Reviewers: jarin,
Message:
PTAL
Description:
Fix version check in push-to-trunk.
The local master branch is not kept up-to-date by the script.
BUG=
[email protected]
Please review this at https://codereview.chromium.org/411593003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+3, -3 lines):
M tools/push-to-trunk/push_to_trunk.py
M tools/push-to-trunk/test_scripts.py
Index: tools/push-to-trunk/push_to_trunk.py
diff --git a/tools/push-to-trunk/push_to_trunk.py
b/tools/push-to-trunk/push_to_trunk.py
index
c05f7489a2bd201be92511ee111cc3f2029df87d..56375fe79b4bbb3dc679096bf6213e051c7ba948
100755
--- a/tools/push-to-trunk/push_to_trunk.py
+++ b/tools/push-to-trunk/push_to_trunk.py
@@ -154,7 +154,7 @@ class IncrementVersion(Step):
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 "
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
5f0fa194b8e13802deb74e9be8058a9e70846de2..f737076ea72683c1178d0e297bb11924fd51dedd
100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -616,8 +616,8 @@ class ScriptTest(unittest.TestCase):
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.
