accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r902642 - in /websites/staging/accumulo/trunk/content: ./ git.html
Date Fri, 21 Mar 2014 02:42:18 GMT
Author: buildbot
Date: Fri Mar 21 02:42:17 2014
New Revision: 902642

Log:
Staging update by buildbot for accumulo

Modified:
    websites/staging/accumulo/trunk/content/   (props changed)
    websites/staging/accumulo/trunk/content/git.html

Propchange: websites/staging/accumulo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 21 02:42:17 2014
@@ -1 +1 @@
-1579731
+1579871

Modified: websites/staging/accumulo/trunk/content/git.html
==============================================================================
--- websites/staging/accumulo/trunk/content/git.html (original)
+++ websites/staging/accumulo/trunk/content/git.html Fri Mar 21 02:42:17 2014
@@ -200,8 +200,8 @@ Jira issue ACCUMULO-12345 that affects 1
 </li>
 <li>
 <p>For the given issue you intend to work on, choose the 'lowest' fixVersion
-   and create a branch for yourself to work in.</p>
-<p><code>git checkout -b ACCUMULO-12345-my-work origin/1.5.1-SNAPSHOT</code></p>
+   and create a branch for yourself to work in. This example is against fixVersion 1.5.2.</p>
+<p><code>git checkout -b ACCUMULO-12345-my-work origin/1.5.2-SNAPSHOT</code></p>
 </li>
 <li>
 <p>Make commits as you see fit as you fix the issue, referencing the issue name
@@ -211,13 +211,13 @@ Jira issue ACCUMULO-12345 that affects 1
 <li>
 <p>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.</p>
-<p><code>git pull --rebase origin 1.5.1-SNAPSHOT</code></p>
+   to lift your changes to the top of your branch. The branch specified here should be the
same one you used in step 4.</p>
+<p><code>git pull --rebase origin 1.5.2-SNAPSHOT</code></p>
 </li>
 <li>
 <p>At this point, you can create a patch file from the upstream branch to
-   attach to the ACCUMULO-12345 Jira issue.</p>
-<p><code>git format-patch 1.5.1-SNAPSHOT --stdout &gt; ACCUMULO-12345.patch</code></p>
+   attach to the ACCUMULO-12345 Jira issue. The branch specified here should be teh same
one you used in step 4.</p>
+<p><code>git format-patch --stdout origin/1.5.2-SNAPSHOT &gt; ACCUMULO-12345.patch</code></p>
 </li>
 </ol>
 <p>An alternative to creating a patch is submitting a request to pull your changes



Mime
View raw message