Repository: activemq-artemis Updated Branches: refs/heads/2.6.x 7214d5658 -> b6ec8245c
NO-JIRA update 2.6.x on scripts Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b6ec8245 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b6ec8245 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b6ec8245 Branch: refs/heads/2.6.x Commit: b6ec8245c909db66a3cad7fb7d9a9fe4ca0665ee Parents: 7214d56 Author: Clebert Suconic <[email protected]> Authored: Wed Aug 8 15:07:39 2018 -0400 Committer: Clebert Suconic <[email protected]> Committed: Wed Aug 8 15:29:11 2018 -0400 ---------------------------------------------------------------------- scripts/merge-PR.sh | 6 +++--- scripts/merge-branch.sh | 4 ++-- scripts/rebase-donation.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b6ec8245/scripts/merge-PR.sh ---------------------------------------------------------------------- diff --git a/scripts/merge-PR.sh b/scripts/merge-PR.sh index dc42761..0d6f622 100755 --- a/scripts/merge-PR.sh +++ b/scripts/merge-PR.sh @@ -39,9 +39,9 @@ git fetch $ARTEMIS_USER_REMOTE_NAME git fetch $ARTEMIS_APACHE_REMOTE_NAME git fetch $ARTEMIS_GITHUB_REMOTE_NAME -git checkout $ARTEMIS_APACHE_REMOTE_NAME/master -B master +git checkout $ARTEMIS_APACHE_REMOTE_NAME/2.6.x -B 2.6.x git checkout $ARTEMIS_GITHUB_REMOTE_NAME/pr/$1 -B $1 -git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME master -git checkout master +git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME 2.6.x +git checkout 2.6.x git merge --no-ff $1 -m "This closes #$*" git branch -D $1 http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b6ec8245/scripts/merge-branch.sh ---------------------------------------------------------------------- diff --git a/scripts/merge-branch.sh b/scripts/merge-branch.sh index 1901623..c2f52fa 100755 --- a/scripts/merge-branch.sh +++ b/scripts/merge-branch.sh @@ -33,8 +33,8 @@ 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 pull --rebase $ARTEMIS_APACHE_REMOTE_NAME 2.6.x +git checkout $ARTEMIS_APACHE_REMOTE_NAME/2.6.x -B 2.6.x git merge --no-ff $1 -m "This closes #$*" git branch -D $1 http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b6ec8245/scripts/rebase-donation.sh ---------------------------------------------------------------------- diff --git a/scripts/rebase-donation.sh b/scripts/rebase-donation.sh index 1cec299..bea9ab5 100755 --- a/scripts/rebase-donation.sh +++ b/scripts/rebase-donation.sh @@ -25,7 +25,7 @@ set -e git fetch temp-hornetq git fetch temp-upstream git checkout temp-hornetq/apache-donation -B donation -git checkout temp-upstream/master -B master-donation +git checkout temp-upstream/2.6.x -B 2.6.x-donation git rebase donation git remote rm temp-hornetq git remote rm temp-upstream
