From a2c722a7b31a65582dbac9dad6fcecaf43cc75cd Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Thu, 14 Nov 2013 14:50:17 +0000 Subject: [PATCH] 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 --- tools/push-to-trunk/push_to_trunk.py | 2 +- tools/push-to-trunk/test_scripts.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/push-to-trunk/push_to_trunk.py b/tools/push-to-trunk/push_to_trunk.py index 9f72cd2..669ba52 100755 --- a/tools/push-to-trunk/push_to_trunk.py +++ b/tools/push-to-trunk/push_to_trunk.py @@ -224,7 +224,7 @@ class CommitRepository(Step): TextToFile(GetLastChangeLogEntries(self.Config(CHANGELOG_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.") diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py index 0975b0d..727e93b 100644 --- a/tools/push-to-trunk/test_scripts.py +++ b/tools/push-to-trunk/test_scripts.py @@ -384,7 +384,7 @@ class ScriptTest(unittest.TestCase): " 2 files changed\n", CheckPreparePush], ["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"], ["checkout svn/bleeding_edge", ""], [("log -1 --format=%H --grep=\"Prepare push to trunk. " -- 2.7.4