tools/push-to-trunk/common_includes.py - Issue 659473002: Make release script cleanup more robust.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 659473002: Make release script cleanup more robust. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 6 years, 2 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:

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"])

« no previous file with comments | « no previous file | no next file » | no next file with comments »