From: machenbach@chromium.org <machenbach@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 18 Feb 2014 14:05:59 +0000 (+0000)
Subject: Fix merge-to-branch python port.
X-Git-Tag: upstream/4.7.83~10644
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f2c040c794b006ac0fa716f88a0017cf23ec707;p=platform%2Fupstream%2Fv8.git

Fix merge-to-branch python port.

This fixes a forgotten parameter when calling the script's toplevel method and adds the same usage message as in the bash script.

BUG=
TBR=ulan@chromium.org

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19450 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 399b33c..43f47b4 100755
--- a/tools/push-to-trunk/merge_to_branch.py
+++ b/tools/push-to-trunk/merge_to_branch.py
@@ -355,6 +355,10 @@ def RunMergeToBranch(config,
 
 def BuildOptions():
   result = optparse.OptionParser()
+  result.set_usage("""%prog [OPTIONS]... [BRANCH] [REVISION]...
+
+Performs the necessary steps to merge revisions from bleeding_edge
+to other branches, including trunk.""")
   result.add_option("-f",
                     help="Delete sentinel file.",
                     default=False, action="store_true")
@@ -396,7 +400,7 @@ def Main():
   if not ProcessOptions(options, args):
     parser.print_help()
     return 1
-  RunMergeToBranch(CONFIG, MergeToBranchOptions(options))
+  RunMergeToBranch(CONFIG, MergeToBranchOptions(options, args))
 
 if __name__ == "__main__":
   sys.exit(Main())