Revision: 24599
Author:   [email protected]
Date:     Tue Oct 14 12:19:32 2014 UTC
Log:      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]

Review URL: https://codereview.chromium.org/659473002
https://code.google.com/p/v8/source/detail?r=24599

Modified:
 /branches/bleeding_edge/tools/push-to-trunk/common_includes.py

=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/common_includes.py Tue Oct 14 12:10:48 2014 UTC +++ /branches/bleeding_edge/tools/push-to-trunk/common_includes.py Tue Oct 14 12:19:32 2014 UTC
@@ -606,7 +606,10 @@
     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.

Reply via email to