Revision: 19450
Author: [email protected]
Date: Tue Feb 18 14:05:59 2014 UTC
Log: 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=
[email protected]
Review URL: https://codereview.chromium.org/164373015
http://code.google.com/p/v8/source/detail?r=19450
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 13:51:46 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/merge_to_branch.py Tue Feb
18 14:05:59 2014 UTC
@@ -355,6 +355,10 @@
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 @@
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())
--
--
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.
