svn commit: r865436 - in /websites/staging/isis/trunk: cgi-bin/ content/ content/contributors/ content/contributors/resources/

[bu...@apache.org]

Author: buildbot
Date: Wed Jun 12 16:49:08 2013
New Revision: 865436

Log:
Staging update by buildbot for isis

Modified:
    websites/staging/isis/trunk/cgi-bin/   (props changed)
    websites/staging/isis/trunk/content/   (props changed)
    websites/staging/isis/trunk/content/contributors/contributing.html
    websites/staging/isis/trunk/content/contributors/resources/git-workflow-2.png
    websites/staging/isis/trunk/content/contributors/resources/git-workflow.png
    websites/staging/isis/trunk/content/contributors/resources/git-workflow.pptx

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jun 12 16:49:08 2013
@@ -1 +1 @@
-1492263
+1492280

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jun 12 16:49:08 2013
@@ -1 +1 @@
-1492263
+1492280

Modified: websites/staging/isis/trunk/content/contributors/contributing.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/contributing.html (original)
+++ websites/staging/isis/trunk/content/contributors/contributing.html Wed Jun 12 16:49:08 2013
@@ -280,7 +280,7 @@
 
 <p>The diagram also indicates the <a href="https://issues.apache.org/jira/browse/ISIS">JIRA</a> ticket; all work in Isis should tracked in JIRA.  Before you decide to start hacking with Isis, it's always worth creating a ticket in JIRA and then have a discussion about it on the <a href="http://isis.apache.org/support.html">mailing lists</a>.  </p>
 
-<p>Assuming you have a JIRA ticket, generally speaking all you need to do once you have your patch is to add a comment with the URL to your patch on your github fork; the Isis committer can then pull down your change.  </p>
+<p>Assuming you have a JIRA ticket, generally speaking all you need to do once you have your patch is to add a comment with the URL to your patch on your github fork; the Isis committer can then download your patch from the JIRA ticket, review it, and apply your patch.  </p>
 
 <p>As a slight simplification to the above, you may decide to clone directly from <a href="https://github.com/apache/isis.git">github.com/apache/isis</a> rather than create your own fork:</p>
 
@@ -347,6 +347,19 @@ why this is a problem, and how the patch
 
 <p>Once your git repo is setup, the next thing you'll most likely want to do is to setup your development environment.  See <a href="development-environment.html">here</a> for more details.</p>
 
+<h2>Creating the patch file</h2>
+
+<p>If you are working off your own github fork, then you can use github to generate your patch files.  Attach them to the relevant JIRA.</p>
+
+<p>If you are working without a github fork, then you can create the patches from your own local git repository.</p>
+
+<p>As per <a href="http://stackoverflow.com/questions/6658313/generate-a-git-patch-for-a-specific-commit">this stackoverflow question</a>, create the patch using <code>git format-patch</code>:</p>
+
+<pre><code>git format-patch -10 HEAD --stdout &gt; 0001-last-10-commits.patch
+</code></pre>
+
+<p>Here <code>-10</code> is the last 10 commits you have done. You need to change that integer according to the commits you need to apply into the patch.</p>
+
 <h2>Sample Contribution Workflow</h2>
 
 <p>Assuming you're development environment is all setup, let's walk through how you might make contribute a patch.  In this example, suppose that you've decided to work on JIRA ticket #123, an enhancement to support Blob/Clob datatypes.</p>

Modified: websites/staging/isis/trunk/content/contributors/resources/git-workflow-2.png
==============================================================================
Binary files - no diff available.

Modified: websites/staging/isis/trunk/content/contributors/resources/git-workflow.png
==============================================================================
Binary files - no diff available.

Modified: websites/staging/isis/trunk/content/contributors/resources/git-workflow.pptx
==============================================================================
Binary files - no diff available.