-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ARROW-13: Add PR merge tool from parquet-mr, suitably modified
Author: Wes McKinney <wesm@apache.org> Closes #7 from wesm/ARROW-13 and squashes the following commits: 7a58712 [Wes McKinney] Add PR merge tool from parquet-mr, suitably modified
- Loading branch information
Showing
2 changed files
with
456 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
<!-- | ||
~ Licensed to the Apache Software Foundation (ASF) under one | ||
~ or more contributor license agreements. See the NOTICE file | ||
~ distributed with this work for additional information | ||
~ regarding copyright ownership. The ASF licenses this file | ||
~ to you under the Apache License, Version 2.0 (the | ||
~ "License"); you may not use this file except in compliance | ||
~ with the License. You may obtain a copy of the License at | ||
~ | ||
~ http://www.apache.org/licenses/LICENSE-2.0 | ||
~ | ||
~ Unless required by applicable law or agreed to in writing, | ||
~ software distributed under the License is distributed on an | ||
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
~ KIND, either express or implied. See the License for the | ||
~ specific language governing permissions and limitations | ||
~ under the License. | ||
--> | ||
|
||
# Arrow Developer Scripts | ||
|
||
This directory contains scripts useful to developers when packaging, | ||
testing, or committing to Arrow. | ||
|
||
Merging a pull request requires being a committer on the project. | ||
|
||
* How to merge a Pull request: | ||
have an apache and apache-github remote setup | ||
``` | ||
git remote add apache-github https://github.com/apache/arrow.git | ||
git remote add apache https://git-wip-us.apache.org/repos/asf/arrow.git | ||
``` | ||
run the following command | ||
``` | ||
dev/merge_arrow_pr.py | ||
``` | ||
|
||
Note: | ||
* The directory name of your Arrow git clone must be called arrow | ||
* Without jira-python installed you'll have to close the JIRA manually | ||
|
||
example output: | ||
``` | ||
Which pull request would you like to merge? (e.g. 34): | ||
``` | ||
Type the pull request number (from https://github.com/apache/arrow/pulls) and hit enter. | ||
``` | ||
=== Pull Request #X === | ||
title Blah Blah Blah | ||
source repo/branch | ||
target master | ||
url https://api.github.com/repos/apache/arrow/pulls/X | ||
Proceed with merging pull request #3? (y/n): | ||
``` | ||
If this looks good, type y and hit enter. | ||
``` | ||
From git-wip-us.apache.org:/repos/asf/arrow.git | ||
* [new branch] master -> PR_TOOL_MERGE_PR_3_MASTER | ||
Switched to branch 'PR_TOOL_MERGE_PR_3_MASTER' | ||
Merge complete (local ref PR_TOOL_MERGE_PR_3_MASTER). Push to apache? (y/n): | ||
``` | ||
A local branch with the merge has been created. | ||
type y and hit enter to push it to apache master | ||
``` | ||
Counting objects: 67, done. | ||
Delta compression using up to 4 threads. | ||
Compressing objects: 100% (26/26), done. | ||
Writing objects: 100% (36/36), 5.32 KiB, done. | ||
Total 36 (delta 17), reused 0 (delta 0) | ||
To git-wip-us.apache.org:/repos/arrow-mr.git | ||
b767ac4..485658a PR_TOOL_MERGE_PR_X_MASTER -> master | ||
Restoring head pointer to b767ac4e | ||
Note: checking out 'b767ac4e'. | ||
You are in 'detached HEAD' state. You can look around, make experimental | ||
changes and commit them, and you can discard any commits you make in this | ||
state without impacting any branches by performing another checkout. | ||
If you want to create a new branch to retain commits you create, you may | ||
do so (now or later) by using -b with the checkout command again. Example: | ||
git checkout -b new_branch_name | ||
HEAD is now at b767ac4... Update README.md | ||
Deleting local branch PR_TOOL_MERGE_PR_X | ||
Deleting local branch PR_TOOL_MERGE_PR_X_MASTER | ||
Pull request #X merged! | ||
Merge hash: 485658a5 | ||
Would you like to pick 485658a5 into another branch? (y/n): | ||
``` | ||
For now just say n as we have 1 branch |
Oops, something went wrong.