How we handle patches (mmoved): Difference between revisions

Line 38:

#* wget -O- http://git.jackgrigg.com/openhatch/patch/?id=5645afd46de0f0b7ba3a3c7035ff0711b5db9202 | git am --3way

#* It's important that you pass the --3way argument to "git am".

# Review the patch ~~series~~ for correctness and cleanliness.

=== Review the patch for correctness and cleanliness ===

Things to think about:

# Does the patch make sense? Does it look readable?

#* git log -p

# If ~~you are satisfied with the~~ patch ~~set:~~

#* Does that patch

## If the author hasn't already done this: tell the author "Please email devel@lists.openhatch.org saying that you're okay with your work being under the Affero GPL, version 3. If you're willing, it is preferable that you say 'the Affero GPL, version 3 or later, at your option'."

# If the author hasn't already done this: tell the author "Please email devel@lists.openhatch.org saying that you're okay with your work being under the Affero GPL, version 3. If you're willing, it is preferable that you say 'the Affero GPL, version 3 or later, at your option'."

## Have someone with deployment access deploy the changes and monitor the deployment.

# If you have revisions you'd like to see made, change the issue status to "in-progress", re-assign the issue to the patch submitter if it isn't already, and leave your review feedback on the ticket.

=== Push and deploy ===

You might need to rope someone else in for this. Right now, only Asheesh (paulproteus) has git push as well as deploy access.

Things to know:

* If you push to origin/master, Hudson will test it.

* Once you're happy, you can run the deploy script, but note that will push the current HEAD to origin/master.

cd mysite

./scripts/deploy

* When you deploy, check a page or two to make sure things are okay.