couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Couchdb Wiki] Update of "Git_At_Apache_Guide" by MarkStruberg
Date Sat, 19 Nov 2011 13:17:07 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Couchdb Wiki" for change notification.

The "Git_At_Apache_Guide" page has been changed by MarkStruberg:
http://wiki.apache.org/couchdb/Git_At_Apache_Guide?action=diff&rev1=19&rev2=20

   1. git-rebase, git-stash and stashing via git-merge --interactive is only allowed if the
history of external contributions remains preserved.
   1. It must not be possible to delete release tags.
  
- == Social Aspects ==
-  1. Pulling from some external (non apache.org hosted) repository must only happen if all
the respective commits are done by a person which has an iCLA on file.
+ == Non-ASF repository collaboration ==
+  1. Doing a test feature branch in private or in a forked github repository is perfectly
fine. But committers should push to the canonical ASF repository early and often to prevent
a fragmentation of the community development effort.
+  1. Even if GIT supports the additional author information, the established policy that
committers should apply their commits to the canonical repository themself remains intact.
+  1. Committers pushing changes to the canonical repository must make sure that the committerIds
and authorIds in the changes they submit are trustworthy (authenticated and iCLA on file).
+  1. Pulling from some external (non apache.org hosted) repository must only happen if all
the respective commits are done by a person which has an iCLA on file and if the diff of the
pull-request is preserved on some ASF server. This can be done by extending JIRA to automatically
download the diffs of a pull-request.The project shall not hesitate to animate people to sign
our iCLA.
   1. Incorporating changes from other contributors (no iCLA on file) must only be handled
via JIRA attached patches because of legal reasons (the 'grant inclusion under ALv2' flag
in JIRA).
   1. The project documentation and project site shall mention the apache.org based GIT repo
as the canonical source location.
  

Mime
View raw message