Differences

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

dev:bzrlp [2010/04/08 16:57]
darlenem
dev:bzrlp [2010/04/08 17:21] (current)
darlenem
Line 61: Line 61:
Launchpad has more [[https://help.launchpad.net/Code/Review|detailed instruction for code review and merger]]; however, step by step instructions are listed below. Launchpad has more [[https://help.launchpad.net/Code/Review|detailed instruction for code review and merger]]; however, step by step instructions are listed below.
 +
 +=== Step by Step Merge and Code Review Instructions ===
 +== Propose a Merge ==
 +  *Visit the branch overview page.  To find this page, begin at the PHP or Py project homepage, click Branches at the top, then click the link for the branch you're working on from the list.  
 +  *Under the heading "Branch Merges" click the link "Propose for Merging" and follow the on-screen prompt.
 +  *Launchpad will notify anyone watching this branch of your proposal.  
 +
 +**Note: If you are not a Committer, please e-mail your changes to the MainDev mailing list.  If you're not a member of the list visit the [[mailing_list_policy#sahana-maindev|mailing list wiki]].**
 +== Code Review ==
 +Anyone with a Launchpad ID can be part of the code review conversation.  The community as a whole appreciates your respectful and constructive criticism.
 +
 +There are two parts to a review: votes and a threaded conversation very similar to a forum discussion.  If you're a subscriber to the branch you'll receive an e-mail whenever someone votes or makes a comment.  There are two ways to contribute:
 +  *Visit the discussion by clicking the link in the e-mail.
 +  *Reply to the e-mail with your comments to be added to the discussion.  There is a detailed list of commands [[https://help.launchpad.net/Code/Review#Email%20interface|at the Launchpad review instructions list]].
 +
 +Once the code has been reviewed and either accepted for merger or rejected (hopefully with useful feedback) the Committer group is ready to merge.
 +
 +== Merge with BZR ==
 +Detailed merger instructions are available for reference in the [[http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/merging_changes.html|BZR canonical documentation]].
 +*The merge command is used to perform the merger:
 +  bzr merge [URL]
 +
 +If you have any questions or would like some assistance feel free to contact the Sahana PHP [[https://launchpad.net/~sahanaphp-pmc|PMC]] or [[https://launchpad.net/~sahanaphp-committers|Committers]].

Navigation
  • Navigate