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 05:36]
chamindra
dev:merge_process [2008/06/19 06:55]
chamindra
Line 34: 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
 +
  
  
Line 45: Line 46:
   * Have a merge tool handy to compare the difference between the trunk and you deployment code base   * Have a merge tool handy to compare the difference between the trunk and you deployment code base
  
-__Rigorous Process__+__Process for Bugs__
   - Identify and isolate Bux Fix in code to merge using the merge tool   - Identify and isolate Bux Fix in code to merge using the merge tool
   - Create a patch for the bug fix   - Create a patch for the bug fix
Line 52: Line 53:
   - Module owner approves the patch and closes it in the patch tracker   - Module owner approves the patch and closes it in the patch tracker
  
-__Simple Process__+__Process for Enhancements__
   - Document all the changes made to the module and send it to the module owner   - 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   - Speak to module owner to identify which fixes in module are relevant
Line 58: Line 59:
   - Send the patch to the module maintainer   - Send the patch to the module maintainer
   - Module owner adds patch to the trunk, tests it and commits it.   - Module owner adds patch to the trunk, tests it and commits it.
 +
  
 ===== Merge Process for Localization work == ===== Merge Process for Localization work ==
  
 +  * PO file will be merged into Pootle

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