airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r919810 - in /websites/staging/airavata/trunk/content: ./ community/how-to-commit-contributed-code.html community/how-to-contribute-code.html
Date Tue, 19 Aug 2014 12:32:12 GMT
Author: buildbot
Date: Tue Aug 19 12:32:12 2014
New Revision: 919810

Log:
Staging update by buildbot for airavata

Modified:
    websites/staging/airavata/trunk/content/   (props changed)
    websites/staging/airavata/trunk/content/community/how-to-commit-contributed-code.html
    websites/staging/airavata/trunk/content/community/how-to-contribute-code.html

Propchange: websites/staging/airavata/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Aug 19 12:32:12 2014
@@ -1 +1 @@
-1618637
+1618850

Modified: websites/staging/airavata/trunk/content/community/how-to-commit-contributed-code.html
==============================================================================
--- websites/staging/airavata/trunk/content/community/how-to-commit-contributed-code.html
(original)
+++ websites/staging/airavata/trunk/content/community/how-to-commit-contributed-code.html
Tue Aug 19 12:32:12 2014
@@ -141,7 +141,7 @@
 <li>Committers accepting the pull requests needs to ensure appropriate credit is given.
Merged committs should annotate to the individual who authored the commit. This is done by
ensuing both name and email addresses are preserved. </li>
 <li>Its better to preverse linear commit history and avoiding merged commits. </li>
 </ul>
-<p>Note: This page describes steps for accepting previously contributed code and is
relavent for Airavata committers. Contributors should refer to <a href="how-to-contribute-code.html">Airavata
Contributor Guide</a></p>
+<p>Note: This page describes steps for accepting previously contributed code and is
relavent for Airavata committers. Contributors should refer to [Airavata Contributor Guide][airavata-contribute]</p>
 <h4 id="contributed-by-a-patch-file">Contributed by a PATCH file</h4>
 <p>If the contributor has submitted a patch file on mailing list or JIRA (prefered),
follow these steps to commit it.</p>
 <ol>
@@ -156,16 +156,19 @@
 <p>Its preferable to clone a new copy into a temporary location (or maintain one for
contributions). This ensures the contributors changes do not get tangled with your local development.
The following steps list out a fresh checkout, adapt them to use your previous checkout. </p>
 <ol>
 <li>Clone the Airavata repo:<code>git clone https://git-wip-us.apache.org/repos/asf/airavata.git</code>.
<code>cd airavata</code> (if the PR is for a branch, do a appropriate checkout)</li>
+<li>If the contributor has provided a github fork and did not create a pull request,
you can directly fetch it and skip next step. If a pull request was created, skip this step
and move to next. To fetch from fork use:<code>git fetch https://github.com/user-to-merge-from/airavata.git
branch-to-merge-from</code></li>
 <li>Configure Airavata GitHUB mirror<ul>
-<li>If you previously have not done add the github mirror: <code>git remote add
github git@github.com:apache/airavata.git</code></li>
-<li>Configure to include pull requests: <code>git config --local --add remote.github.fetch
'+refs/pull/*/head:refs/remotes/github/pr/*'</code></li>
-<li>(optional) you can check out pull requests as a branch and test/review it. Example:
<code>git checkout github/pr/3</code>. <a href="https://help.github.com/articles/checking-out-pull-requests-locally">Github
PR Local checkout</a> lists this steps in detail. </li>
+<li>If you previously have not done add the github mirror: <code>git remote add
airavata-github git@github.com:apache/airavata.git</code></li>
+<li>Configure to include pull requests: <code>git config --local --add remote.airavata-github.fetch
'+refs/pull/*/head:refs/remotes/airavata-github/pr/*'</code></li>
+<li>Fetch all GitHub pull requests <code>git fetch airavata-github</code></li>
+<li>(optional) you can check out pull requests as a branch and test/review it. Example:
<code>git checkout airavata-github/pr/3</code>. <a href="https://help.github.com/articles/checking-out-pull-requests-locally">Github
PR Local checkout</a> lists this steps in detail. </li>
 </ul>
 </li>
 <li>Pick the changes you want to merge from the pull requests: <code>git cherry-pick
hash-to-merge</code>.</li>
 <li>Its a good practice to run the full build with test enabled to ensure the patch
did not break the code.</li>
 <li>Finally push the patch to remote master/branch using git push.</li>
 </ol>
+<p>iravata-contribute]: how-to-contribute-code.html</p>
         	</article>
     	</section>
       </div><!--/span-->

Modified: websites/staging/airavata/trunk/content/community/how-to-contribute-code.html
==============================================================================
--- websites/staging/airavata/trunk/content/community/how-to-contribute-code.html (original)
+++ websites/staging/airavata/trunk/content/community/how-to-contribute-code.html Tue Aug
19 12:32:12 2014
@@ -140,7 +140,7 @@
 <h4 id="create-an-issue-in-jira">Create an issue in JIRA</h4>
 <p>If it’s a bug or a feature request, open a JIRA issue. Create a sample that
you can use for prototyping the feature or demonstrating the bug. If creating a sample is
time consuming, write steps to reproduce the issue. Attach this sample to the JIRA issue if
it’s representing a bug report.   </p>
 <h4 id="create-a-pull-request-in-github">Create a pull request in GitHub</h4>
-<p><a href="development/source.html">Checkout</a> the source code. Create
a pull request (PR) in GitHub for the change you're interested in making. The comment section
of the PR must contain a link to the JIRA issue. Please also reference the issue in the commit
message, and make sure it properly describes the changes that have been made and their purpose.</p>
+<p><a href="/development/source.html">Checkout</a> the source code. Create
a pull request (PR) in GitHub for the change you're interested in making. The comment section
of the PR must contain a link to the JIRA issue. Please also reference the issue in the commit
message, and make sure it properly describes the changes that have been made and their purpose.</p>
 <p>Some good references for working with GitHub are below. We ask that you keep your
change rebased to master as much as possible, and we will ask you to rebase again if master
has moved before accepting your patch.   </p>
 <ul>
 <li><a href="https://help.github.com/articles/set-up-git">Setting Up Git with
GitHub</a></li>



Mime
View raw message