activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-6 git commit: Updated README to reflect new git work flow
Date Mon, 17 Nov 2014 16:02:52 GMT
Repository: activemq-6
Updated Branches:
  refs/heads/master 97bbe8cd1 -> c6716f2f2


Updated README to reflect new git work flow


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/6040342b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/6040342b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/6040342b

Branch: refs/heads/master
Commit: 6040342b0a12af9de6cdbec3220422dbadecf3ce
Parents: 97bbe8c
Author: Martyn Taylor <mtaylor@redhat.com>
Authored: Mon Nov 17 15:06:31 2014 +0000
Committer: Martyn Taylor <mtaylor@redhat.com>
Committed: Mon Nov 17 15:49:40 2014 +0000

----------------------------------------------------------------------
 README.md | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/6040342b/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 5b1eff0..dbdda1c 100644
--- a/README.md
+++ b/README.md
@@ -185,11 +185,12 @@ Core ActiveMQ6 members have write access to the Apache ActiveMQ6 repositories
an
 
 To setup repositories for reviewing and pushing:
 
-```
+```bash
   # Clone the GitHub Mirror of ActiveMQ6 Repo:
   git clone git@github.com:apache/activemq-6.git
 
-  # Add the following section to your <activemq repo>/.git/config statement to fetch
all pull requests sent to the GitHub mirror.  Note that the remote name for git@github.com:apache/activemq-6.git
may be different.  Be sure to edit all references to the remote name.  In this case "activemq".
+  # Add the following section to your <activemq6 repo>/.git/config statement to fetch
all pull requests sent to the GitHub mirror.  Note that the remote name for git@github.com:apache/activemq-6.git
may be different.  Be sure to edit all references to the remote name.  In this case "activemq".
+
   [remote "origin"]
         url = git@github.com:apache/activemq-6.git
         fetch = +refs/heads/*:refs/remotes/origin/*
@@ -197,7 +198,7 @@ To setup repositories for reviewing and pushing:
 
 
   # Add the Apache repository as a remote
-  git remote add apache https://git-wip-us.apache.org/repos/asf/activemq-6.git
+  git remote add upstream https://git-wip-us.apache.org/repos/asf/activemq-6.git
 
   # Fetch
   git fetch --all
@@ -205,8 +206,8 @@ To setup repositories for reviewing and pushing:
 
 To push commits from a pull request to the apache repository:
 
-```
-  cd <activemq repo>
+```bash
+  cd <activemq6 repo>
 
   # Download all the remote branches etc... including all the pull requests.
   git fetch --all
@@ -214,9 +215,46 @@ To push commits from a pull request to the apache repository:
   # Checkout the pull request you wish to review
   git checkout pr/2
 
-  # Ensure this patch is rebased onto apache/master
-  git rebase apache/master
+  # Review is done...  READY TO MERGE.
+
+  # Check out the master branch.
+  git checkout master
+
+  # Ensure you are up to date
+  git pull
 
-  # Continue through review process.  Once an Ack has been sent.  Push to the Apache ActiveMQ6
repo
-  git push apache pr/2:master
+  # Create a new merge commit from the 
+  git merge --no-ff pr/2
+
+  #  IMPORTANT: In this commit message be sure to write something along the lines of: "Merge
Pull Request #2" Where 2 is the Pull Request ID.  "#2" shows up as a link in the GitHub UI
for navigating to the PR from the commit message.
+
+  # Pushes to the upstream repo.
+  git push upstream master
 ```
+
+#### Notes:
+
+The GitHub mirror repository is cloning the Apache ActiveMQ6 repository (The root repository).
 There maybe a slight delay between when a commit is pushed to the Apache repo and when that
commit is reflected in the GitHub mirror.  This may cause some difficulty when trying to push
a PR to upstream (Apache) that has been merged on an out of date GitHub (mirror) master. 
You can wait for the mirror to update before performing the steps above.  A solution to this
is to change local master branch to track the upstream (Apache) master, rather than GitHub
(mirror) master by editing your config to look like this:
+
+```bash
+  [branch "master"]
+        remote = upstream
+        merge = refs/heads/master
+```
+
+Where upstream points to the Apache Repo.
+
+If you'd like master to always track GitHub master, then another way to acheive this is to
add another branch that tracks upstream master and push from that branch to upstream master
e.g.
+
+```bash
+  # .git/config entry
+  [branch "umaster"]
+        remote = upstream
+        merge = refs/heads/master
+
+  git checkout umaster
+  git pull
+  git merge --no-ff pr/2
+  git push upstream umaster:master # Push local branch umaster to upstream branch master.
+```
+


Mime
View raw message