Reviewers: ,
Message:
Committed patchset #1 (id:1) manually as 24599 (presubmit successful).
Description:
Make release script cleanup more robust.
This is a work-around that checks out master if the
remembered branch is corrupt.
BUG=chromium:410721
LOG=n
TEST=script_test.py
[email protected]
Committed: https://code.google.com/p/v8/source/detail?r=24599
Please review this at https://codereview.chromium.org/659473002/
Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+4, -1 lines):
M tools/push-to-trunk/common_includes.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
e95a20b06442c2f33b1c03219fd79ac543fa459f..dc430e3c67a7eaddd2b94083fbcad455f342c9f2
100644
--- a/tools/push-to-trunk/common_includes.py
+++ b/tools/push-to-trunk/common_includes.py
@@ -606,7 +606,10 @@ class Step(GitRecipesMixin):
self.DeleteBranch(self._config["BRANCHNAME"])
def CommonCleanup(self):
- self.GitCheckout(self["current_branch"])
+ if ' ' in self["current_branch"]:
+ self.GitCheckout('master')
+ else:
+ self.GitCheckout(self["current_branch"])
if self._config["BRANCHNAME"] != self["current_branch"]:
self.GitDeleteBranch(self._config["BRANCHNAME"])
--
--
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.
