178
edits
(→Branching: Update for new procedure) |
|||
Line 17: | Line 17: | ||
=== Branching === | === Branching === | ||
* Create a branch for the | * Create a branch for the 1.4.x releases from master, named branch-1-4 | ||
* | ** git checkout -b branch-1-4 master | ||
* | * Increase version on branch-1-4 to 1.4.0pre (using <code>devtools/update-version.pl</code>; see below), and commit | ||
** git tag -m "Mark 1.4. | ** <code>devtools/update-version.pl 1 4 0 pre</code> | ||
** git push origin tag desc/1.4.0git | ** <code>git commit -m "This is 1.4.0pre" -a</code> | ||
** git tag -m "Mark 1. | * Create annotated tag desc/1.4.0pre on that commit and push | ||
** git push origin tag desc/1. | ** <code>git tag -m "Mark 1.4.0pre" desc/1.4.0pre</code> | ||
** <code>git push origin tag desc/1.4.0pre branch-1-4:branch-1-4</code> | |||
* Increase version on master to 1.5.0git, and commit | |||
** <code>git checkout master</code> | |||
** <code>devtools/update-version.pl 1 5 0 git</code> | |||
** <code>git commit -m "This is 1.5.0git" -a</code> | |||
* Create annotated tag desc/1.5.0git on that commit and push | |||
** <code>git tag -m "Mark 1.5.0git" desc/1.5.0git</code> | |||
** <code>git push origin tag desc/1.5.0git master</code> | |||
=== Preparing the source === | === Preparing the source === |
edits