Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Unified Diff: tools/push-to-trunk/git_recipes.py

Issue 607023002: Fix resolving svn revisions in release scripts. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/push-to-trunk/test_scripts.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/push-to-trunk/git_recipes.py
diff --git a/tools/push-to-trunk/git_recipes.py b/tools/push-to-trunk/git_recipes.py
index 456156f7094983cae4b1d42d31ed08861e44c63b..a1e6256df29db1b26e7ea5676f584c72700e39d5 100644
--- a/tools/push-to-trunk/git_recipes.py
+++ b/tools/push-to-trunk/git_recipes.py
@@ -295,8 +295,11 @@ class GitRecipesMixin(object):
@Strip
def GitSVNFindGitHash(self, revision, branch="", **kwargs):
assert revision
- return self.Git(
- MakeArgs(["svn find-rev", "r%s" % revision, branch]), **kwargs)
+ args = MakeArgs(["svn find-rev", "r%s" % revision, branch])
+
+ # Pick the last line if multiple lines are available. The first lines might
+ # print information about rebuilding the svn-git mapping.
+ return self.Git(args, **kwargs).splitlines()[-1]
@Strip
def GitSVNFindSVNRev(self, git_hash, branch="", **kwargs):
« no previous file with comments | « no previous file | tools/push-to-trunk/test_scripts.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698