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 2016/08/29 18:14:24 UTC
[1/2] activemq-artemis git commit: Script to help compare old commits
Repository: activemq-artemis
Updated Branches:
refs/heads/master 6a1a1b085 -> e3af370c2
Script to help compare old commits
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2ef79f66
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2ef79f66
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2ef79f66
Branch: refs/heads/master
Commit: 2ef79f66d934473f3117eb9fecfb7d48181f1a6d
Parents: 6a1a1b0
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Aug 29 11:50:12 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Aug 29 13:57:47 2016 -0400
----------------------------------------------------------------------
docs/hacking-guide/en/history.md | 10 ++++++++++
scripts/rebase-donation.sh | 27 +++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2ef79f66/docs/hacking-guide/en/history.md
----------------------------------------------------------------------
diff --git a/docs/hacking-guide/en/history.md b/docs/hacking-guide/en/history.md
index 76e74b0..e49405f 100644
--- a/docs/hacking-guide/en/history.md
+++ b/docs/hacking-guide/en/history.md
@@ -19,3 +19,13 @@ Credit should be given to those developers who contributed to the HornetQ projec
- Adrian Brock
For more information please visit the [HornetQ GitHub project](https://github.com/hornetq/hornetq/tree/apache-donation).
+
+
+Rebasing original donation
+==========================
+
+It may be useful to look at the donation history combined with the artemis history. It is the case when eventually looking at old changes.
+
+For that there is a script that will rebase master against the donation branch under master/scripts:
+
+- rebase-donation.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2ef79f66/scripts/rebase-donation.sh
----------------------------------------------------------------------
diff --git a/scripts/rebase-donation.sh b/scripts/rebase-donation.sh
new file mode 100755
index 0000000..6cb4a10
--- /dev/null
+++ b/scripts/rebase-donation.sh
@@ -0,0 +1,27 @@
+#!/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.
+
+# more information about this script at https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/history.md
+
+git remote add hornetq https://github.com/hornetq/hornetq.git
+git fetch hornetq
+git checkout hornetq/apache-donation -B donation
+git checkout apache/master -B master-donation
+git rebase donation
+git remote rm hornetq
+git branch -D donation
[2/2] activemq-artemis git commit: This closes #739
Posted by jb...@apache.org.
This closes #739
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e3af370c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e3af370c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e3af370c
Branch: refs/heads/master
Commit: e3af370c2b1337b14291879c9119400b09750091
Parents: 6a1a1b0 2ef79f6
Author: jbertram <jb...@apache.com>
Authored: Mon Aug 29 13:13:39 2016 -0500
Committer: jbertram <jb...@apache.com>
Committed: Mon Aug 29 13:13:39 2016 -0500
----------------------------------------------------------------------
docs/hacking-guide/en/history.md | 10 ++++++++++
scripts/rebase-donation.sh | 27 +++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
----------------------------------------------------------------------