Index: tools/push-to-trunk/push_to_trunk.py |
diff --git a/tools/push-to-trunk/push_to_trunk.py b/tools/push-to-trunk/push_to_trunk.py |
index b487b0f8fafab1bde6d5b1663571de558edc68d4..c317bdc7305443d4e588e7703c89877fc0b34014 100755 |
--- a/tools/push-to-trunk/push_to_trunk.py |
+++ b/tools/push-to-trunk/push_to_trunk.py |
@@ -39,7 +39,6 @@ CONFIG = { |
BRANCHNAME: "prepare-push", |
TRUNKBRANCH: "trunk-push", |
PERSISTFILE_BASENAME: "/tmp/v8-push-to-trunk-tempfile", |
- TEMP_BRANCH: "prepare-push-temporary-branch-created-by-script", |
DOT_GIT_LOCATION: ".git", |
VERSION_FILE: "src/version.cc", |
CHANGELOG_FILE: "ChangeLog", |
@@ -58,6 +57,11 @@ class Preparation(Step): |
def RunStep(self): |
self.InitialEnvironmentChecks() |
self.CommonPrepare() |
+ |
+ if(self["current_branch"] == self.Config(TRUNKBRANCH) |
+ or self["current_branch"] == self.Config(BRANCHNAME)): |
+ print "Warning: Script started on branch %s" % self["current_branch"] |
+ |
self.PrepareBranch() |
self.DeleteBranch(self.Config(TRUNKBRANCH)) |