| Index: tools/push-to-trunk/merge_to_branch.py
|
| diff --git a/tools/push-to-trunk/merge_to_branch.py b/tools/push-to-trunk/merge_to_branch.py
|
| index 399b33c0198f15b2646f9ceb932901b3977215d3..43f47b40745fceba86c063b4343a051c71422568 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())
|
|
|