Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
Next revision Both sides next revision
dev:merge_process [2008/06/19 04:45]
chamindra
dev:merge_process [2008/06/19 06:55]
chamindra
Line 22: Line 22:
  
 The list of module and library owners and maintainers can be found [[dev:development_team | here]] The list of module and library owners and maintainers can be found [[dev:development_team | here]]
 +
  
 ===== Merge Process Kickoff Meeting ===== ===== Merge Process Kickoff Meeting =====
Line 33: Line 34:
   - Nominate point people and Sahana committers who will participate in the merge process   - Nominate point people and Sahana committers who will participate in the merge process
   - Define a brief schedule and milestones for the work   - Define a brief schedule and milestones for the work
 +
 +
 +
 +
 +===== Merge Process per Bug Fix / Enhancement =====
 +
 +__Have Ready__
 +
 +  * Identify the module/library owner and get in touch with them over email. You can find the list [[here]]
 +  * Checkout an updated version of the trunk
 +  * Have a merge tool handy to compare the difference between the trunk and you deployment code base
 +
 +__Process for Bugs__
 +  - Identify and isolate Bux Fix in code to merge using the merge tool
 +  - Create a patch for the bug fix
 +  - Register the bug fix in the tracker and attach the patch 
 +  - Module owner takes the patch, adds it to the trunk and tests it
 +  - Module owner approves the patch and closes it in the patch tracker
 +
 +__Process for Enhancements__
 +  - Document all the changes made to the module and send it to the module owner
 +  - Speak to module owner to identify which fixes in module are relevant
 +  - Create an entire module patch with only the fixes asked by module owner
 +  - Send the patch to the module maintainer
 +  - Module owner adds patch to the trunk, tests it and commits it.
 +
 +
 +===== Merge Process for Localization work ==
 +
 +  * PO file will be merged into Pootle

Navigation
QR Code
QR Code dev:merge_process (generated for current page)