|
|
Line 51: |
Line 51: |
| === Working on Mozbase and Contributing Patches === | | === Working on Mozbase and Contributing Patches === |
|
| |
|
| Changes to mozbase require peer review of a properly filed bug. Here's a workflow that will help you make changes to mozbase in isolation.
| | Working on mozbase is the same as working on any other part of the mozilla-central source tree. See the following links for tips on getting set up with Mercurial and how to submit a patch: |
|
| |
|
| * If there isn't one already on file, [https://bugzilla.mozilla.org/enter_bug.cgi?product=Testing&component=Mozbase&cc=:jhammel create a bug] corresponding to your issue in the mozbase bugzilla component. | | * https://developer.mozilla.org/en-US/docs/Mercurial |
| | | * https://developer.mozilla.org/en-US/docs/Installing_Mercurial |
| * Inside the mozbase checkout, create a local branch corresponding to your bug: | | * https://developer.mozilla.org/en-US/docs/Mercurial_Queues |
| | | * https://developer.mozilla.org/en-US/docs/Mercurial_FAQ |
| git checkout -b bug-xxxxxxx
| | * https://developer.mozilla.org/en-US/docs/Developer_Guide/How_to_Submit_a_Patch |
| | |
| * ''Develop your patch'' | |
| | |
| * If people commit work to the master branch while you're working on your patch, you can make things up to date by issuing the following commands from your checked out branch:
| |
| | |
| git pull origin master
| |
| git rebase master
| |
| | |
| * When you're happy with your work, commit your changes, giving them a descriptive title from the bug summary:
| |
| | |
| Bug 706981 - Check for DistributionNotFound error
| |
| | |
| * Generate a patch for your bug
| |
| | |
| git format-patch HEAD^
| |
| | |
| * Attach the patch to the bug and ask the appropriate person for review. If further changes are required, you can amend changes to your patch by using 'git commit --amend'. When you're all done, ask someone with mozbase commit privileges to merge your changes into the mozilla mozbase repository.
| |
| | |
| This is a recommended way of working with mozbase. In general the important things are:
| |
| * having an bug filed in [https://bugzilla.mozilla.org bugzilla] | |
| * having a patch on bugzilla that applies against [https://github.com/mozilla/mozbase the mozbase github repository] master 'HEAD' | |
| | |
| Please don't use github pull requests. This again requires us to do more work duplicating the pull request and associated patch in bugzilla
| |
|
| |
|
| ==== Design Principles ==== | | ==== Design Principles ==== |