Reviewers: tandrii,
Message:
PTAL
Description:
Fix new git workflow in release scripts.
Need to svn fetch in order to make svn find-rev work.
BUG=chromium:410721
LOG=n
TEST=script_test.py
[email protected]
Please review this at https://codereview.chromium.org/662643002/
Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+5, -0 lines):
M tools/push-to-trunk/common_includes.py
M tools/push-to-trunk/test_scripts.py
Index: tools/push-to-trunk/common_includes.py
diff --git a/tools/push-to-trunk/common_includes.py
b/tools/push-to-trunk/common_includes.py
index
dc430e3c67a7eaddd2b94083fbcad455f342c9f2..e7e220facafe9780061a2c12b98eb0442565bbdc
100644
--- a/tools/push-to-trunk/common_includes.py
+++ b/tools/push-to-trunk/common_includes.py
@@ -370,6 +370,7 @@ class GitTagsOnlyMixin(VCInterface):
def Fetch(self):
self.step.Git("fetch")
+ self.step.GitSVNFetch()
def GetTags(self):
return self.step.Git("tag").strip().splitlines()
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
c551aa840e4670143ae5f168d0ba99508e7f820d..6925929481a5ee87b3f779a6d688ea7ff6d252b4
100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -901,6 +901,7 @@ Performance and stability improvements on all
platforms.""", commit)
Cmd("git status -s -uno", ""),
Cmd("git status -s -b -uno", "## some_branch\n"),
Cmd("git fetch", ""),
+ Cmd("git svn fetch", ""),
Cmd("git branch", " branch1\n* branch2\n"),
Cmd("git branch", " branch1\n* branch2\n"),
Cmd("git checkout -b %s origin/master" % TEST_CONFIG["BRANCHNAME"],
@@ -922,6 +923,7 @@ Performance and stability improvements on all
platforms.""", commit)
Cmd("git log -1 --format=%B
rev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"),
Cmd("git log -1 --format=%an rev1", "[email protected]\n"),
Cmd("git fetch", "fetch result\n"),
+ Cmd("git svn fetch", ""),
Cmd("git checkout -f origin/master", ""),
Cmd("git diff origin/candidates push_hash", "patch content\n"),
Cmd("git svn find-rev push_hash", "123455\n"),
@@ -1342,6 +1344,7 @@ LOG=N
Cmd("git status -s -uno", ""),
Cmd("git status -s -b -uno", "## some_branch\n"),
Cmd("git fetch", ""),
+ Cmd("git svn fetch", ""),
Cmd("git branch", " branch1\n* branch2\n"),
Cmd("git checkout -b %s origin/candidates" %
TEST_CONFIG["BRANCHNAME"], ""),
@@ -1514,6 +1517,7 @@ git-svn-id:
svn://svn.chromium.org/chrome/trunk/src@3456 0039-1c4b
Cmd("git status -s -uno", ""),
Cmd("git status -s -b -uno", "## some_branch\n"),
Cmd("git fetch", ""),
+ Cmd("git svn fetch", ""),
Cmd("git branch", " branch1\n* branch2\n"),
Cmd("git checkout -b %s" % TEST_CONFIG["BRANCHNAME"], ""),
Cmd("git branch -r", " branch-heads/3.21\n branch-heads/3.3\n"),
--
--
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.
