From b4d92528db3d7c252447b5a1fd57aae35f4e2d94 Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Thu, 16 Oct 2014 13:45:59 +0000 Subject: [PATCH] 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 TBR=tandrii@chromium.org Review URL: https://codereview.chromium.org/662643002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24666 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- tools/push-to-trunk/common_includes.py | 1 + tools/push-to-trunk/test_scripts.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/tools/push-to-trunk/common_includes.py b/tools/push-to-trunk/common_includes.py index dc430e3..e7e220f 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() diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py index c551aa8..6925929 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", "author1@chromium.org\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"), -- 2.7.4