activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject activemq-artemis git commit: NO-JIRA: script to merge 1.x
Date Fri, 09 Dec 2016 19:52:20 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x ebbc91c72 -> 3758f2a0c


NO-JIRA: script to merge 1.x


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3758f2a0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3758f2a0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3758f2a0

Branch: refs/heads/1.x
Commit: 3758f2a0c2631eecec7bb137cdb4297112a7bfab
Parents: ebbc91c
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Fri Dec 9 14:51:31 2016 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Fri Dec 9 14:51:31 2016 -0500

----------------------------------------------------------------------
 scripts/merge-PR.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3758f2a0/scripts/merge-PR.sh
----------------------------------------------------------------------
diff --git a/scripts/merge-PR.sh b/scripts/merge-PR.sh
index dc42761..99623bd 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/1.x -B master
 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 1.x
+git checkout 1.x
 git merge --no-ff $1 -m "This closes #$*"
 git branch -D $1


Mime
View raw message