Index: tools/push-to-trunk/chromium_roll.py |
diff --git a/tools/push-to-trunk/chromium_roll.py b/tools/push-to-trunk/chromium_roll.py |
index 4e0137057170b839483d64d2751b82af48d54635..03f18f6e605ac58c7f0441699da85093a6e93037 100755 |
--- a/tools/push-to-trunk/chromium_roll.py |
+++ b/tools/push-to-trunk/chromium_roll.py |
@@ -87,10 +87,15 @@ class UploadCL(Step): |
% self["sheriff"]) |
self.GitCommit("%s%s\n\nTBR=%s" % |
(commit_title, sheriff, self._options.reviewer)) |
- self.GitUpload(author=self._options.author, |
- force=True, |
- cq=self._options.use_commit_queue) |
- print "CL uploaded." |
+ if not self._options.dry_run: |
+ self.GitUpload(author=self._options.author, |
+ force=True, |
+ cq=self._options.use_commit_queue) |
+ print "CL uploaded." |
+ else: |
+ self.GitCheckout("master") |
+ self.GitDeleteBranch("v8-roll-%s" % self["trunk_revision"]) |
+ print "Dry run - don't upload." |
class SwitchV8(Step): |