Confirmed users
514
edits
Labs/Jetpack/FlightDeck/Code Workflow/Management Commands: Difference between revisions
Jump to navigation
Jump to search
Labs/Jetpack/FlightDeck/Code Workflow/Management Commands (view source)
Revision as of 10:06, 22 July 2010
, 22 July 2010→workflow
m (→workflow) |
|||
| Line 79: | Line 79: | ||
=== ''workflow'' === | === ''workflow'' === | ||
There has to be a hotfix branch created after the release was already merged into production | |||
git remote add -t hotfix-1234-name_of_the_hotfix john-1234-name_of_the_hotfix git@github.com:john/FlightDeck.git -f | git remote add -t hotfix-1234-name_of_the_hotfix john-1234-name_of_the_hotfix git@github.com:john/FlightDeck.git -f | ||
If there is no support branch for the release - create it from a first hotfix | |||
git checkout -b release-1.0a3 john-1234-name_of_the_hotfix | |||
else - merge the hotfix into support branch | |||
git checkout release-1.0a3 | |||
git merge --no-ff john-1234-name_of_the_hotfix | |||
change the version to 1.0a3.1 | |||
vi flightdeck/settings.py | |||
git commit flightdeck/settings.py -m "Bumped version number to 1.0a3.1" | |||
git tag -a 1.0a3.1 | |||
git push main release-1.0a3 --tags | |||