You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/05/02 17:25:50 UTC
[1/2] activemq-artemis git commit: NO-JIRA: Adding script that will
checkout a PR branch
Repository: activemq-artemis
Updated Branches:
refs/heads/master 03bce9a12 -> 17d891858
NO-JIRA: Adding script that will checkout a PR branch
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/46c9cbe6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/46c9cbe6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/46c9cbe6
Branch: refs/heads/master
Commit: 46c9cbe643ed46e31989549cd1b2d0cda3b33d67
Parents: 03bce9a
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue May 2 13:07:32 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 2 13:16:14 2017 -0400
----------------------------------------------------------------------
scripts/checkout-PR.sh | 34 ++++++++++++++++++++++++++++++++++
scripts/merge-branch.sh | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46c9cbe6/scripts/checkout-PR.sh
----------------------------------------------------------------------
diff --git a/scripts/checkout-PR.sh b/scripts/checkout-PR.sh
new file mode 100755
index 0000000..a354793
--- /dev/null
+++ b/scripts/checkout-PR.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+# 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.
+
+# Setting the script to fail if anything goes wrong
+set -e
+
+# this script is a helper that will checkout the PR Branch
+
+ARTEMIS_USER_REMOTE_NAME=${ARTEMIS_USER_REMOTE_NAME:-origin}
+ARTEMIS_APACHE_REMOTE_NAME=${ARTEMIS_APACHE_REMOTE_NAME:-apache}
+ARTEMIS_GITHUB_REMOTE_NAME=${ARTEMIS_GITHUB_REMOTE_NAME:-upstream}
+
+git fetch $ARTEMIS_USER_REMOTE_NAME
+git fetch $ARTEMIS_APACHE_REMOTE_NAME
+git fetch $ARTEMIS_GITHUB_REMOTE_NAME
+
+git checkout $ARTEMIS_GITHUB_REMOTE_NAME/pr/$1 -B $1
+
+echo "\ndo your own rebase by typing: git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME master"
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46c9cbe6/scripts/merge-branch.sh
----------------------------------------------------------------------
diff --git a/scripts/merge-branch.sh b/scripts/merge-branch.sh
new file mode 100755
index 0000000..1901623
--- /dev/null
+++ b/scripts/merge-branch.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+# 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.
+
+# Setting the script to fail if anything goes wrong
+set -e
+
+# This is a helpr script to help merging branches checked out
+# with checkout-PR.sh
+
+ARTEMIS_USER_REMOTE_NAME=${ARTEMIS_USER_REMOTE_NAME:-origin}
+ARTEMIS_APACHE_REMOTE_NAME=${ARTEMIS_APACHE_REMOTE_NAME:-apache}
+ARTEMIS_GITHUB_REMOTE_NAME=${ARTEMIS_GITHUB_REMOTE_NAME:-upstream}
+
+git fetch $ARTEMIS_USER_REMOTE_NAME
+git fetch $ARTEMIS_APACHE_REMOTE_NAME
+git fetch $ARTEMIS_GITHUB_REMOTE_NAME
+
+
+git checkout $1
+
+git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME master
+git checkout $ARTEMIS_APACHE_REMOTE_NAME/master -B master
+
+git merge --no-ff $1 -m "This closes #$*"
+git branch -D $1
[2/2] activemq-artemis git commit: This closes #1241
Posted by jb...@apache.org.
This closes #1241
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/17d89185
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/17d89185
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/17d89185
Branch: refs/heads/master
Commit: 17d891858872cae1f8c6d5a7b2f3b35ed25fcf3c
Parents: 03bce9a 46c9cbe
Author: Justin Bertram <jb...@apache.org>
Authored: Tue May 2 12:25:26 2017 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Tue May 2 12:25:26 2017 -0500
----------------------------------------------------------------------
scripts/checkout-PR.sh | 34 ++++++++++++++++++++++++++++++++++
scripts/merge-branch.sh | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
----------------------------------------------------------------------