This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new c951043 ARROW-3460: [Packaging] Add a script to rebase master on
local release branch
c951043 is described below
commit c951043825bbb19d8ece0e123cd9e5c7ec80f962
Author: Kouhei Sutou <[email protected]>
AuthorDate: Mon Oct 8 10:08:17 2018 -0400
ARROW-3460: [Packaging] Add a script to rebase master on local release
branch
This script assumes that "apache" remote refers
`[email protected]:apache/arrow.git`.
Author: Kouhei Sutou <[email protected]>
Closes #2718 from kou/packaging-post-release-rebase and squashes the
following commits:
f53005f37 <Kouhei Sutou> Add a script to rebase master on local release
branch
---
dev/release/post-00-rebase.sh | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/dev/release/post-00-rebase.sh b/dev/release/post-00-rebase.sh
new file mode 100755
index 0000000..c80ce24
--- /dev/null
+++ b/dev/release/post-00-rebase.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# 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.
+#
+set -e
+set -u
+
+if [ "$#" -ne 1 ]; then
+ echo "Usage: $0 <local-release-branch>"
+ exit
+fi
+
+local_release_branch=$1
+
+echo "Fetch the latest commits"
+git fetch --all --prune
+echo "Checkout the master branch"
+git checkout master
+echo "Apply the latest commits on the master branch"
+git rebase apache/master
+echo "Apply the unpushed commits on the local release branch"
+git rebase ${local_release_branch}
+echo "Push the rebased branch to master"
+git push --force apache master
+
+echo "Success! The rebased commits are available here:"
+echo " https://github.com/apache/arrow/commits/master";
