DevProcess
![Bugathon Developer Process] (https://dl.dropbox.com/u/8526836/Bugathon_Process.png)https://dl.dropbox.com/u/8526836/Bugathon_Process.png
- Recommended: Code has appropriate test coverage using a combination of unit, functional and integration tests
- Code conforms to Magento coding standards
- Code passes Magento technical review
- Code is approved by Magento Product Manager
Before you can start coding, do the following.
vgadiyar@L-SJC-00520818 /c/Bugathon/CE
$ git clone https://github.com/magento/bugathon_march_2013.git
Cloning into bugathon_march_2013...
remote: Counting objects: 16563, done.
remote: Compressing objects: 100% (7679/7679), done.
remote: Total 16563 (delta 6783), reused 16542 (delta 6768)
Receiving objects: 100% (16563/16563), 20.12 MiB | 102 KiB/s, done.
Resolving deltas: 100% (6783/6783), done.
vgadiyar@L-SJC-00520818 /c/Bugathon/CE/bugathon_march_2013 (master)
$ git checkout -b vgadiyar-157
Switched to a new branch 'vgadiyar-157'
vgadiyar@L-SJC-00520818 /c/Bugathon/CE/bugathon_march_2013 (vgadiyar-157)
$ git push origin vgadiyar-157
Username for 'github.com':
Password for 'github.com':
Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/magento/bugathon_march_2013.git
* [new branch] vgadiyar-157 -> vgadiyar-157
At this point, you are ready to make code changes related to the issue #157.
Push your changes as often as possible using the commands below. Use appropriate message (-m option) for intermediate check-ins. E.g. "initial check-in" etc. When you are ready to do a pull request use "-m closes #" in your commit command.
$ git status
# On branch vgadiyar-157
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: RELEASE_NOTES.txt
#
no changes added to commit (use "git add" and/or "git commit -a")
vgadiyar@L-SJC-00520818 /c/Bugathon/CE/bugathon_march_2013 (vgadiyar-157)
$ git add RELEASE_NOTES.txt
vgadiyar@L-SJC-00520818 /c/Bugathon/CE/bugathon_march_2013 (vgadiyar-157)
Commit message should correspond Commit Requirements.
$ git commit -m "Fixed MAGE-4567: Tax report shows wrong figures if partial invoice"
[vgadiyar-157 50aa81d] Fixed MAGE-4567: Tax report shows wrong figures if partial invoice
1 files changed, 1 insertions(+), 1 deletions(-)
vgadiyar@L-SJC-00520818 /c/Bugathon/CE/bugathon_march_2013 (vgadiyar-157)
$ git push origin vgadiyar-157
Username for 'github.com':
Password for 'github.com':
Counting objects: 5, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 325 bytes, done.
Total 3 (delta 2), reused 0 (delta 0)
To https://github.com/magento/bugathon_march_2013.git
870ab1e..50aa81d vgadiyar-157 -> vgadiyar-157
When you are ready, navigate to your branch and create a pull request as shown by image below.
Confirm that you want to send pull request. Use text area for any useful message to Magento developers and architects
Magento developers and architects who are on site for the Bugathon will review the pull request. Click on the commit link to review the changes. And finally, use the Merge pull request button to merge the code the bugathon master branch. These steps are illustrated in the screen shot below.
Click on the commit link to review the code changes made for the issue. Use "Merge Pull Reqeust" to complete merge
Confirm that you want to merge..
Review the result of the merge. The issues (#157 in this case) will automatically be closed.
