From: machenbach@chromium.org Date: Tue, 18 Feb 2014 14:17:08 +0000 (+0000) Subject: Fix merge-to-branch options. X-Git-Tag: upstream/4.7.83~10643 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77c278b94d8b2380751aa743ea4c0250a2673750;p=platform%2Fupstream%2Fv8.git Fix merge-to-branch options. BUG= TBR=ulan@chromium.org Review URL: https://codereview.chromium.org/170443003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19453 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/tools/push-to-trunk/merge_to_branch.py b/tools/push-to-trunk/merge_to_branch.py index 43f47b4..7d5f53f 100755 --- a/tools/push-to-trunk/merge_to_branch.py +++ b/tools/push-to-trunk/merge_to_branch.py @@ -52,11 +52,11 @@ CONFIG = { 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", "")