corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1652668 - /incubator/corinthia/www/contribute_committer.html
Date Sat, 17 Jan 2015 20:38:42 GMT
Author: jani
Date: Sat Jan 17 20:38:42 2015
New Revision: 1652668

URL: http://svn.apache.org/r1652668
Log:
first version of committer

Modified:
    incubator/corinthia/www/contribute_committer.html

Modified: incubator/corinthia/www/contribute_committer.html
URL: http://svn.apache.org/viewvc/incubator/corinthia/www/contribute_committer.html?rev=1652668&r1=1652667&r2=1652668&view=diff
==============================================================================
--- incubator/corinthia/www/contribute_committer.html (original)
+++ incubator/corinthia/www/contribute_committer.html Sat Jan 17 20:38:42 2015
@@ -13,66 +13,44 @@
 	  <!--content section -->
 	  <div class="row">
 	  <div class="large-12 columns">
-  	  <div class="float left"><img src="img/owl.jpg" width="250" height="250" alt=""
title="" /></div>	  	  
+  	  <div class="hide-for-small float left"><img src="img/owl.jpg" width="250" height="250"
alt="" title="" /></div>	  	  
 	  	   	<h3>Committer's Guide</h3>
-			    <b>TO BE MODIFIED</b>
-	  			<p>The Apache Corinthia Git repositories are hosted in the ASF infrastructure
and mirrored to Github. This is the current 
-				repository layout:
-				<br><strong>Apache - the main and official repository GitHub - mirror of
the ASF repository, used to accept contributions 
-				and do code reviews</strong></p>
-	  		<h3>Before</h3>
-	  			<p>For everything except the most trivial changes, the submitter must have a
CLA on file. Check the list of Apache committers, and 
-				non-commiters with ICLAs on record and prompt the contributor to file an appropriate
CLA if required.
-	  			For all significant changes, there must be a Jira issue. If a Jira issue is not referenced
in the PR and/or commit messages, prompt the 
-				contributor to open a Jira issue.</p>
+	  			<p>To participate in a apache project, you start as contributor by contributing
patches,
+				   participating in the mail discussions, thereby earning merit. The PMC (Project Management
Committee) will acknowledge 
+				   the motivation and invite you as committer. A committer has write access to the repos.<br>
+				   If you think about the project as such, you will soon be invited to join the PMC.
Being PMC basically means you must
+				   vote on releases and help define the direction of the project.</p>
+	  		<h3>Before becomming a committer</h3>
+	  			<p>As contributor you submit changes and a committer checks them for validity
before adding them to the repo.
+				   As committer you do not need to ask first (even though we all often do) but can update
the repo as you wish, 
+				   therefore you need to be registred in Apache Software Foundation. This is done by
submitting a ICLA. 
+				   The ICLA acknowledges that all your contributions are done under the Apache License
(Alv2) this guarantees that the
+				   project is free opensource which can be reused by the whole world.<br>
+				   As part of the ICLA you must choose an apache userId, check the list of Apache committers,
and non-commiters with ICLAs
+				   on record (you can find them all <a href="http://people.apache.org">here</a><br>
+				   In corinthia we have decided that all committers are also PMC members, to avoid a
2 class community,
+				   so when you are invited it will be as committer and PPMC, of course you can choose
not to accept at all or only accept
+				   being committer.</p>
+                        <h3>Being a committer/PMC</h3>
+			        <p>You have earned merit by contributing and are now recognized as a person
who contributes positively to the project.
+				   Please use your new karma carefully, even though you can update the repo directly
it is good to discuss bigger changes
+				   first, especially changes in API and other parts used by others. We use dev@ intensively
to discuss changes, and first
+				   when we have consensus these bigger changes are integrated.<br>
+				   The most important part is to have fun, working on/with corinthia is not work!</p>
 	  		<h3>Rules of thumb</h3>
 	  		 	<ul>
-	  				<li>Every contribution is a piece of intellectual property.Please treat it with
respect.</li>
-	  				<li>Preserve both the name and email address.This is the precious sustenance
that nourishes our project.</li>
-	  				<li>Ensure your name and email address are there as the committer prior to pushing
it to the Apache repositories.</li>
-	  				<li>Always give credit where it is due, ensure every merged commit reflects
properly the individual who authored that commit.</li>
+	  			   <li>Every contribution is a piece of intellectual property. Please treat it
with respect.</li>
+	  			   <li>Preserve both the name and email address. This is the precious sustenance
that nourishes our project.</li>
+	  			   <li>Ensure your name and email address are there as the committer prior to
pushing it to the Apache repositories.</li>
+	  			   <li>Always give credit where it is due, ensure every merged commit reflects
the individual who authored that commit.</li>
 	  			</ul> 
 	  		<h3>Setting up your repository</h3>
-	  			<p>Clone the canonical ASF repo using this command. The --origin option tells
git to name the remote apache instead of the default, 
-	  			origin; this will reduce ambiguity when we later add a second remote upstream.</p>
-	  		  	<div class="panel">git clone --origin apache https://git-wip-us.apache.org/repos/asf/incubator-corinthia.git</div>
-	  			<p>Add a second remote, for the GitHub repository.</p>
-	  			<div class="panel">git remote add github https://github.com/apache/incubator-corinthia.git</div>
-	  			<p>For the GitHub remote, add an additional fetch reference which will cause
every pull request to be made available as a remote 
-	  			branch in your workspace.</p>
-	   		 	<div class="panel">git config --local --add remote.github.fetch '+refs/pull/*/head:refs/remotes/github/pr/*'</div>
-	   			<p>Finally, run git fetch --all to update from all remote repositories - you
will see all the pull requests appear:</p>
-	   			<div class="panel"> [new ref]         refs/pull/98/head -> github/pr/98
-	   			* [new ref]         refs/pull/99/head -> github/pr/99</div>
-	   	 	<h3>Merging a pull request</h3>
-	   			<p>Fetch the latest remote branches, which will cause a remote branch for the
PR to become available to you.
-	   			<div class="panel">git fetch --all</div>
-	   			If you want to inspect the PR and/or run tests, check out the branch:
-	   	  	  	<div class="panel">git checkout github/pr/1234</div>
-				<p>To perform the merge, first update your master branch to the latest:</p>
-	   	  		<div class="panel">git checkout master   git pull --rebase</div>
-	   			<p>Then merge and push:</p>
-	   			<div class="panel">git merge --no-ff -m 'This closes #1234' github/pr/1234 git
push apache master</div>
-	   			<p>Note that this commit message is important, as this is what will trigger
the pull request to be automatically closed, and the --no-ff means that a 
-	   			merge commit will always be created.</p>
-	   		<h3>Alternative options</h3>
-	  		<h4 class="subheader">Adding the remote reference to the contributor’s repository</h4>
-	  		<p>Fetch the branch of the user you want to merge from
-	  		<div class="panel">git fetch https://github.com/user-to-merge-from/incubator-corinthia.git
branch-to-merge-from</div>
-			<p>If you commonly merge from a particular user, you’ll want to add their repo
as a remote to make fetching branches easier.</p>
-	 		<div class="panel">git remote add user-to-merge-from https://github.com/user-to-merge-from/incubator-corinthia.git
-	 		<br> git fetch user-to-merge-from</div>
-	 	  	<h3>Merging from a patch file</h3>
-	 		<p>Save the patch from the Github patch link (just append ‘.patch’ to
the pull request link to get it). This patch will keep the authorship of the 
-			commit, so we should use it instead of the diff. Apply the patch preserving the original
author:</p>
-	 		<div class="panel">git am pull-request-9876.patch</div>
-	 		<h3>Additional information</h3>
-	 		<p>Particularly for new committers, you may find the following information useful:</p>
-	 			<ul>
-     	 			<li>Guide for new project committers</li>
-    	 			<li>Committers FAQ</li>
-    	 			<li>Git at Apache</li>
-				</ul>
+			        <p>Clone the canonical ASF repo using this command:</p> 
+	  		  	<div class="panel">git clone https://git-wip-us.apache.org/repos/asf/incubator-corinthia.git</div>
+				<p>We highly recommend that you do your work in a local branch, and the merge it
to master with --squash before committing
+				   to the remote repo. This allows you to make as many small commits as you like, while
all the others only see your 
+				   final commit<br>
+				   You can read more about the use of GIT in our GIT FAQ</p>
 	  	</div> 
       </div> 
 <!--#include virtual="footer.html" -->



Mime
View raw message