Version 3.30.27 (based on 803872ecbd11bdff877dcbc15d15a181558c59be)
Cr-Commit-Position: refs/heads/candidates@{#25051}
git-svn-id: https://v8.googlecode.com/svn/trunk@25051 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/ChangeLog b/ChangeLog
index 710e5ff..fd2aaa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-02: Version 3.30.27
+
+ Performance and stability improvements on all platforms.
+
+
2014-11-02: Version 3.30.26
Performance and stability improvements on all platforms.
diff --git a/src/version.cc b/src/version.cc
index 3b308d0..e72ef22 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -34,7 +34,7 @@
// system so their names cannot be changed without changing the scripts.
#define MAJOR_VERSION 3
#define MINOR_VERSION 30
-#define BUILD_NUMBER 26
+#define BUILD_NUMBER 27
#define PATCH_LEVEL 0
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
diff --git a/tools/push-to-trunk/common_includes.py b/tools/push-to-trunk/common_includes.py
index 914599f..a555500 100644
--- a/tools/push-to-trunk/common_includes.py
+++ b/tools/push-to-trunk/common_includes.py
@@ -400,6 +400,9 @@
return "origin/%s" % name
return "branch-heads/%s" % name
+ def PushRef(self, ref):
+ self.step.Git("push origin %s" % ref)
+
def Tag(self, tag, remote, message):
# Wait for the commit to appear. Assumes unique commit message titles (this
# is the case for all automated merge and push commits - also no title is
@@ -418,7 +421,7 @@
"git updater is lagging behind?")
self.step.Git("tag %s %s" % (tag, commit))
- self.step.Git("push origin %s" % tag)
+ self.PushRef(tag)
class GitReadSvnWriteInterface(GitTagsOnlyMixin, GitSvnInterface):
@@ -436,11 +439,17 @@
raise NotImplementedError()
def Land(self):
+ # FIXME(machenbach): This will not work with checkouts from bot_update
+ # after flag day because it will push to the cache. Investigate if it
+ # will work with "cl land".
self.step.Git("push origin")
def CLLand(self):
self.step.GitCLLand()
+ def PushRef(self, ref):
+ self.step.Git("push https://chromium.googlesource.com/v8/v8 %s" % ref)
+
VC_INTERFACES = {
"git_svn": GitSvnInterface,
@@ -726,6 +735,8 @@
(root, self._config["PATCH_FILE"]),
cwd=self._options.svn):
self.Die("Could not apply patch.")
+ # Recursively add possibly newly added files.
+ self.Command("svn", "add --force %s" % root, cwd=self._options.svn)
self.Command(
"svn",
"commit --non-interactive --username=%s --config-dir=%s -m \"%s\"" %
diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py
index 08969ab..d92c388 100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -948,6 +948,7 @@
Cmd("svn status", "", cwd=svn_root),
Cmd("patch -d trunk -p1 -i %s" %
TEST_CONFIG["PATCH_FILE"], "Applied patch...", cwd=svn_root),
+ Cmd("svn add --force trunk", "", cwd=svn_root),
Cmd("svn commit --non-interactive --username=author@chromium.org "
"--config-dir=[CONFIG_DIR] "
"-m \"Version 3.22.5 (based on push_hash)\"",
@@ -957,7 +958,7 @@
"\"Version 3.22.5 (based on push_hash)\""
" origin/candidates", "hsh_to_tag"),
Cmd("git tag 3.22.5 hsh_to_tag", ""),
- Cmd("git push origin 3.22.5", ""),
+ Cmd("git push https://chromium.googlesource.com/v8/v8 3.22.5", ""),
Cmd("git checkout -f some_branch", ""),
Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""),
Cmd("git branch -D %s" % TEST_CONFIG["TRUNKBRANCH"], ""),
@@ -1769,6 +1770,7 @@
Cmd("svn status", "", cwd=svn_root),
Cmd("patch -d branches/bleeding_edge -p1 -i %s" %
TEST_CONFIG["PATCH_FILE"], "Applied patch...", cwd=svn_root),
+ Cmd("svn add --force branches/bleeding_edge", "", cwd=svn_root),
Cmd("svn commit --non-interactive --username=author@chromium.org "
"--config-dir=[CONFIG_DIR] "
"-m \"[Auto-roll] Bump up version to 3.11.6.0\"",
