svn commit: r919441 - in /websites/staging/mahout/trunk/content: ./ developers/patch-check-list.html

[bu...@apache.org]

Author: buildbot
Date: Fri Aug 15 15:41:44 2014
New Revision: 919441

Log:
Staging update by buildbot for mahout

Modified:
    websites/staging/mahout/trunk/content/   (props changed)
    websites/staging/mahout/trunk/content/developers/patch-check-list.html

Propchange: websites/staging/mahout/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Aug 15 15:41:44 2014
@@ -1 +1 @@
-1618142
+1618216

Modified: websites/staging/mahout/trunk/content/developers/patch-check-list.html
==============================================================================
--- websites/staging/mahout/trunk/content/developers/patch-check-list.html (original)
+++ websites/staging/mahout/trunk/content/developers/patch-check-list.html Fri Aug 15 15:41:44 2014
@@ -243,32 +243,23 @@
   <div id="content-wrap" class="clearfix">
    <div id="main">
     <h1 id="patch-check-list">Patch Check List</h1>
-<p>So, you want to apply a patch - or you want to know in more detail what committers look for in your patches?
+<p>So, you want to merge a contribution- or you want to know in more detail what committers look for in your contribution?
 Here are tips, traps, etc. for dealing with
-patches:</p>
+PRs:</p>
 <ul>
-<li>Get a fresh copy of trunk.  Or at least make sure you are up to date and
-clean your build area.  For complex patches, it is recommended you deal
-with a fresh checkout.</li>
-<li>Look at the patch and see where it is applied.  Ideally it is generated
-from the root, but not everyone does this.</li>
-<li>Apply the patch with <em>patch -p 0 -i &lt;path to patch&gt;</em>  Throw a <em>--dry-run</em> on there if you want
-to see what happens w/o screwing up your checkout.</li>
 <li>Did the author write unit tests?  Are the unit tests worthwhile?</li>
 <li>Are the licenses correct on newly added files? Has an ASF license been
 granted?</li>
-<li>Update the <a href="https://svn.apache.org/viewvc/mahout/trunk/CHANGELOG?view=markup" title="CHANGELOG">CHANGELOG</a> file.  Give proper credit to the authors.</li>
 <li>Make sure you update JIRA by assigning the issue to you so that others
 know you are working on it.</li>
-<li>If it is a complex change and you have added to the original author's
-patch, it is suggested that you create a new patch and attach that to JIRA
-so that it can be discussed.</li>
 <li>How is the documentation, especially the javadocs?</li>
-<li>Before committing, make sure you add any new documents to SVN.  Just because
-the patch added them doesn't mean you have :)</li>
+<li>Before committing, make sure you add any new documents to your local Git repo.  </li>
 <li>Run all unit tests, verify that all tests pass.</li>
-<li>Put in a meaningful commit message, referencing the JIRA issue.</li>
-<li>Remember to update the issue in JIRA when you have completed it.</li>
+<li>Lastly, update the <a href="https://github.com/apache/mahout/blob/master/CHANGELOG">CHANGELOG</a> file. Give proper credit to the authors.</li>
+</ul>
+<p>After the above steps are verified and completed, and the contribution is ready to merge, follow the steps in the "Merging a PR" section in: <a href="http://mahout.apache.org/developers/github.html">Handling Github PRs</a>.</p>
+<ul>
+<li>Remember to update the issue status in JIRA when you have completed it.</li>
 </ul>
    </div>
   </div>