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 "Merge_Procedure" by NoahSlater
Date Mon, 07 May 2012 22:38:31 GMT
Dear Wiki user,

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

The "Merge_Procedure" page has been changed by NoahSlater:
http://wiki.apache.org/couchdb/Merge_Procedure?action=diff&rev1=4&rev2=5

  ## page was renamed from Merge_procedure
  <<Include(EditTheWiki)>>
  
- = Merge Timeline =
+ = Introduction =
  
  A typical timeline might look like this:
  
@@ -19, +19 @@

   * Merge bugfix 3 in to 1.4.x branch
   * Release 1.4.1
  
- = Merge Procedure =
+ Each one of these items is the responsibility of the Release Manager.
  
+ The developers submit merge requests for completed work to the Release Manager.
+ 
+ The Release Manager should follow this document when handling merge requests.
+ 
+ Nothing should be committed to a release branch besides what goes through this process.
+ 
+ If we all follow this, it will improve our code quality, test coverage, and documentation.
+ 
+ = Merge Request =
+ 
+ The merge request is done by the developer wanting to add changes to a release branch.
+ 
+ If you want to make a merge request, please follow these steps:
+ 
+  * Prepare your code.
+ 
+    * Preferably on a feature branch, but master is okay too.
+ 
+  * Add any new tests that cover your code.
+ 
+  * Add any new docs that cover your code.
+ 
+  * '''@@ DO WE NEED ANY OTHER STEPS HERE?'''
+ 
+  * Run `make distcheck` a few times and verify that it works reliably.
+ 
+  * Send an email to [[http://mail-archives.apache.org/mod_mbox/couchdb-dev/|couchdb-dev]]
mailing list
+ 
+    * Choose a subject like "[MERGE] Feature description"
+ 
+    * Have you added tests? If not, explain why.
+ 
+    * Have you added docs? If not, explain why.
+ 
+    * Does `make distcheck` work reiably? If not, start over.
+ 
+    * Ask people to check your code, and cast a vote.
+ 
+  * Wait 72 hours for a lazy consensus.
+ 
+    * And then nudge a Release Manager if necessary!
+ 
+ = Merge Testing =
+ 
+ If someone has posted a merge request to the mailing list, you should test it.
+ 
+ Here are some things you can do:
+ 
+  * Are there any tests?
+ 
+    * If not, are you happy with the rationale provided?
+ 
+    * Are the tests good tests?
+ 
+    * Do the tests cover the code properly?
+ 
+    * Are the tests reliable?
+ 
+      * Do they fail on slower systems?
+ 
+      * Do they fail indeterminately?
+ 
+  * Are there any docs?
+ 
+    * If not, are you happy with the rationale provided?
+ 
+    * Are the docs good docs?
+ 
+    * Do the docs cover the code properly?
+ 
+    * Are the docs easy to understand?
+ 
+  * Does `make distcheck` work reliably?
+ 
+  * Does the code run on multiple operating systems?
+ 
+    * Can you test it under Linux?
+ 
+      * Can you test it under multiple distributions?
+ 
+    * Can you test it under OS X?
+ 
+    * Can you test it under Windows?
+ 
+  * Can you test it on multiple architectures?
+ 
+    * Can you test it under 32 bit?
+ 
+    * Can you test it under 64 bit?
+ 
+  * Can you test it on multiple interpreters?
+ 
+    * Can you test it on the latest Erlang?
+ 
+    * Can you test it on the stock Erlang?
+ 
+    * Can you test it on other version of Erlang?
+ 
+ Please look in to as much of this as possible, then send your results back to the list.
+ 
+ Hopefully, we can automate some of this testing at some point soon.
+ 
+ Do you fancy helping us with that? [[http://couchdb.apache.org/#contribute|Get in touch!]]
+ 
+ = Feature Branches =
+ 

Mime
View raw message