Author: smarru
Date: Tue Aug 19 12:32:06 2014
New Revision: 1618850
URL: http://svn.apache.org/r1618850
Log:
adding a fetch instruction
Modified:
airavata/site/trunk/content/community/how-to-commit-contributed-code.mdtext
airavata/site/trunk/content/community/how-to-contribute-code.mdtext
Modified:
airavata/site/trunk/content/community/how-to-commit-contributed-code.mdtext
URL:
http://svn.apache.org/viewvc/airavata/site/trunk/content/community/how-to-commit-contributed-code.mdtext?rev=1618850&r1=1618849&r2=1618850&view=diff
==============================================================================
--- airavata/site/trunk/content/community/how-to-commit-contributed-code.mdtext
(original)
+++ airavata/site/trunk/content/community/how-to-commit-contributed-code.mdtext
Tue Aug 19 12:32:06 2014
@@ -43,15 +43,17 @@ If the contributor has submitted a patch
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.
1. Clone the Airavata repo:`git clone
https://git-wip-us.apache.org/repos/asf/airavata.git`. `cd airavata` (if the PR
is for a branch, do a appropriate checkout)
-2. Configure Airavata GitHUB mirror
- * If you previously have not done add the github mirror: `git remote
add github [email protected]:apache/airavata.git`
- * Configure to include pull requests: `git config --local --add
remote.github.fetch '+refs/pull/*/head:refs/remotes/github/pr/*'`
- * (optional) you can check out pull requests as a branch and
test/review it. Example: `git checkout github/pr/3`. [Github PR Local
checkout][github-pr-checkout] lists this steps in detail.
-3. Pick the changes you want to merge from the pull requests: `git cherry-pick
hash-to-merge`.
-4. Its a good practice to run the full build with test enabled to ensure the
patch did not break the code.
-5. Finally push the patch to remote master/branch using git push.
+1. 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:`git fetch
https://github.com/user-to-merge-from/airavata.git branch-to-merge-from`
+1. Configure Airavata GitHUB mirror
+ * If you previously have not done add the github mirror: `git remote
add airavata-github [email protected]:apache/airavata.git`
+ * Configure to include pull requests: `git config --local --add
remote.airavata-github.fetch
'+refs/pull/*/head:refs/remotes/airavata-github/pr/*'`
+ * Fetch all GitHub pull requests `git fetch airavata-github`
+ * (optional) you can check out pull requests as a branch and
test/review it. Example: `git checkout airavata-github/pr/3`. [Github PR Local
checkout][github-pr-checkout] lists this steps in detail.
+1. Pick the changes you want to merge from the pull requests: `git cherry-pick
hash-to-merge`.
+1. Its a good practice to run the full build with test enabled to ensure the
patch did not break the code.
+1. Finally push the patch to remote master/branch using git push.
[asf-git-instructions]: https://git-wip-us.apache.org/#contents
-[airavata-source]: development/source.html
-[airavata-contribute]: how-to-contribute-code.html
+[a[airavata-source]: /development/source.html
+iravata-contribute]: how-to-contribute-code.html
[github-pr-checkout]:
https://help.github.com/articles/checking-out-pull-requests-locally
Modified: airavata/site/trunk/content/community/how-to-contribute-code.mdtext
URL:
http://svn.apache.org/viewvc/airavata/site/trunk/content/community/how-to-contribute-code.mdtext?rev=1618850&r1=1618849&r2=1618850&view=diff
==============================================================================
--- airavata/site/trunk/content/community/how-to-contribute-code.mdtext
(original)
+++ airavata/site/trunk/content/community/how-to-contribute-code.mdtext Tue Aug
19 12:32:06 2014
@@ -29,7 +29,7 @@ If itâs a bug or a feature request,
#### Create a pull request in GitHub
-[Checkout] [checkout] 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.
+[Checkout] [airavata-source] 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.
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.
@@ -55,7 +55,7 @@ A pull request is considered ready to be
Developers with Airavata Commit access should read [Accepting
Contribtions][accept-contributions] on steps to accept the contributed code
[jira]: https://issues.apache.org/jira/browse/airavata
-[checkout]: development/source.html
+[airavata-source]: /development/source.html
[setup-git]: https://help.github.com/articles/set-up-git
[fork-repo]: https://help.github.com/articles/fork-a-repo
[pull-request]: https://help.github.com/articles/using-pull-requests
