Fixed blocking dcommit in push-to-trunk script.

BUG=
R=jkummerow@chromium.org

Review URL: https://codereview.chromium.org/72703002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17750 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 901e4f60
...@@ -224,7 +224,7 @@ class CommitRepository(Step): ...@@ -224,7 +224,7 @@ class CommitRepository(Step):
TextToFile(GetLastChangeLogEntries(self.Config(CHANGELOG_FILE)), TextToFile(GetLastChangeLogEntries(self.Config(CHANGELOG_FILE)),
self.Config(CHANGELOG_ENTRY_FILE)) self.Config(CHANGELOG_ENTRY_FILE))
if self.Git("cl dcommit -v", "PRESUBMIT_TREE_CHECK=\"skip\"") is None: if self.Git("cl dcommit -f", "PRESUBMIT_TREE_CHECK=\"skip\"") is None:
self.Die("'git cl dcommit' failed, please try again.") self.Die("'git cl dcommit' failed, please try again.")
......
...@@ -384,7 +384,7 @@ class ScriptTest(unittest.TestCase): ...@@ -384,7 +384,7 @@ class ScriptTest(unittest.TestCase):
" 2 files changed\n", " 2 files changed\n",
CheckPreparePush], CheckPreparePush],
["cl upload -r \"reviewer@chromium.org\" --send-mail", "done\n"], ["cl upload -r \"reviewer@chromium.org\" --send-mail", "done\n"],
["cl dcommit -v", "Closing issue\n"], ["cl dcommit -f", "Closing issue\n"],
["svn fetch", "fetch result\n"], ["svn fetch", "fetch result\n"],
["checkout svn/bleeding_edge", ""], ["checkout svn/bleeding_edge", ""],
[("log -1 --format=%H --grep=\"Prepare push to trunk. " [("log -1 --format=%H --grep=\"Prepare push to trunk. "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment