You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/07/28 21:41:27 UTC
[1/2] activemq-artemis git commit: Adding set -e on merge script
Repository: activemq-artemis
Updated Branches:
refs/heads/master c530ce103 -> ec64e674e
Adding set -e on merge script
I had some cases where I had pending changes on my local copy and the script silent failed.
This will make sure people using this script would notice any failure during a merge
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f19a030c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f19a030c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f19a030c
Branch: refs/heads/master
Commit: f19a030cc4de590667b604a75c90e56c4c36734a
Parents: c530ce1
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Jul 28 15:23:57 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jul 28 17:41:08 2016 -0400
----------------------------------------------------------------------
scripts/merge-PR.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f19a030c/scripts/merge-PR.sh
----------------------------------------------------------------------
diff --git a/scripts/merge-PR.sh b/scripts/merge-PR.sh
index d7225e6..dc42761 100755
--- a/scripts/merge-PR.sh
+++ b/scripts/merge-PR.sh
@@ -16,9 +16,11 @@
# specific language governing permissions and limitations
# under the License.
+# Setting the script to fail if anything goes wrong
+set -e
# Use this to simplify the rebasing of PRs. PRs will be rebased during the merge on this process.
-# use: ./rebase-PR <PRID> textual description
+# use: ./merge-PR <PRID> textual description
# this script assumes the following remote entries on your config
#
[2/2] activemq-artemis git commit: This closes #682
Posted by cl...@apache.org.
This closes #682
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ec64e674
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ec64e674
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ec64e674
Branch: refs/heads/master
Commit: ec64e674eede032d57b2146c7515443a61d0abe2
Parents: c530ce1 f19a030
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Jul 28 17:41:09 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jul 28 17:41:09 2016 -0400
----------------------------------------------------------------------
scripts/merge-PR.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------