AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix version check in push-to-trunk.

Browse Source 
The local master branch is not kept up-to-date by the script.

BUG=
TBR=jarin@chromium.org

Review URL: https://codereview.chromium.org/411593003

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22546 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
machenbach@chromium.org 2014-07-23 09:25:36 +00:00
parent 0bef0dafdb
commit 8c8e528850
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/push-to-trunk/push_to_trunk.py
View File

@ -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 "

4
tools/push-to-trunk/test_scripts.py
View File

@ -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([