| #summary Gerrit and melange |
| |
| = Introduction = |
| |
| Add your content here. |
| |
| |
| = Setup = |
| |
| {{{ |
| # add remote |
| git remote add gerrit https://melange-sandbox.googlesource.com/soc |
| # setup push-for-review script |
| git config --global alias.push-for-review '!CURRENT=$(git symbolic-ref HEAD) && git push gerrit HEAD:refs/for/master%topic=$CURRENT' |
| # add change-id hook |
| curl -Lo `git rev-parse --git-dir`/hooks/commit-msg https://gerrit-review.googlesource.com/tools/hooks/commit-msg ; chmod +x `git rev-parse --git-dir`/hooks/commit-msg |
| }}} |
| |
| * Log into the Gerrit UI at least once: https://melange-sandbox-review.googlesource.com |
| * if the email address in your git commits doesn't line up with the account you log into Gerrit with, you must add that email address: https://melange-sandbox-review.googlesource.com/#/settings/contact |
| |
| = Code Review = |
| |
| == Reviewing your branch == |
| # Create a branch, work on your change, commit your change. |
| # git push-for-review |
| # in the Gerrit web UI, explicitly add at least one reviewer |
| # review happens. |
| # if changes are necessary, commit, rebase, go back to step 2. |
| |
| == Syncing and preparing your branch == |
| # pull the latest changes to master |
| * git checkout master |
| * git pull origin master |
| # rebase your branch on master git rebase master and fix possible conflicts on the way |
| * git checkout your-branch |
| * git rebase master |
| # git push-for-review |
| # if the rebase cleared the review approvals, ask the reviewers for another look. Otherwise, the changes are almost ready to be submitted |
| # locally merge your branch into master |
| * git checkout master |
| * git merge your-branch |
| |
| == Submitting the code == |
| # click submit button in web ui |
| # push your master branch to code.google.com/p/soc |
| |
| = Interesting Links = |
| https://wiki.openstack.org/wiki/Gerrit_Workflow |
| |
| = Permission Levels = |
| |
| * Project Owner |
| * Committer |
