Revision: 19453
Author: [email protected]
Date: Tue Feb 18 14:17:08 2014 UTC
Log: Fix merge-to-branch options.
BUG=
[email protected]
Review URL: https://codereview.chromium.org/170443003
http://code.google.com/p/v8/source/detail?r=19453
Modified:
/branches/bleeding_edge/tools/push-to-trunk/merge_to_branch.py
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/merge_to_branch.py Tue Feb
18 14:05:59 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/merge_to_branch.py Tue Feb
18 14:17:08 2014 UTC
@@ -52,11 +52,11 @@
class MergeToBranchOptions(CommonOptions):
def __init__(self, options, args):
- super(MergeToBranchOptions, self).__init__(options, options.m)
+ super(MergeToBranchOptions, self).__init__(options, True)
self.requires_editor = True
self.wait_for_lgtm = True
self.delete_sentinel = options.f
- self.message = options.m
+ self.message = getattr(options, "message", "")
self.revert = "--reverse" if getattr(options, "r", None) else ""
self.revert_bleeding_edge = getattr(options, "revert_bleeding_edge",
False)
self.patch = getattr(options, "p", "")
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
