Author: busbey
Date: Fri Mar 21 02:42:04 2014
New Revision: 1579871
URL: http://svn.apache.org/r1579871
Log:
CMS commit to accumulo by busbey
Modified:
accumulo/site/trunk/content/git.mdtext
Modified: accumulo/site/trunk/content/git.mdtext
URL:
http://svn.apache.org/viewvc/accumulo/site/trunk/content/git.mdtext?rev=1579871&r1=1579870&r2=1579871&view=diff
==============================================================================
--- accumulo/site/trunk/content/git.mdtext (original)
+++ accumulo/site/trunk/content/git.mdtext Fri Mar 21 02:42:04 2014
@@ -134,9 +134,9 @@ Jira issue ACCUMULO-12345 that affects 1
`git fetch && git fetch --tags`
4. For the given issue you intend to work on, choose the 'lowest' fixVersion
- and create a branch for yourself to work in.
+ and create a branch for yourself to work in. This example is against
fixVersion 1.5.2.
- `git checkout -b ACCUMULO-12345-my-work origin/1.5.1-SNAPSHOT`
+ `git checkout -b ACCUMULO-12345-my-work origin/1.5.2-SNAPSHOT`
5. Make commits as you see fit as you fix the issue, referencing the issue name
in the commit message:
@@ -145,14 +145,14 @@ Jira issue ACCUMULO-12345 that affects 1
6. Assuming others are developing against the version you also are, as you
work, or before you create your patch, rebase your branch against the remote
- to lift your changes to the top of your branch.
+ to lift your changes to the top of your branch. The branch specified here
should be the same one you used in step 4.
- `git pull --rebase origin 1.5.1-SNAPSHOT`
+ `git pull --rebase origin 1.5.2-SNAPSHOT`
7. At this point, you can create a patch file from the upstream branch to
- attach to the ACCUMULO-12345 Jira issue.
+ attach to the ACCUMULO-12345 Jira issue. The branch specified here should
be teh same one you used in step 4.
- `git format-patch 1.5.1-SNAPSHOT --stdout > ACCUMULO-12345.patch`
+ `git format-patch --stdout origin/1.5.2-SNAPSHOT > ACCUMULO-12345.patch`
An alternative to creating a patch is submitting a request to pull your changes
from some repository, e.g. Github. Please include the repository and branch
