releasing: Copyedit post-release branching directions

dev
Bryce Harrington 9 years ago
parent eaa43fc310
commit 6657fda58a
  1. 4
      releasing.txt

@ -81,14 +81,14 @@ To make a release of Weston and/or Wayland, follow these steps.
For x.y.0 releases, also create the release series x.y branch. The x.y For x.y.0 releases, also create the release series x.y branch. The x.y
branch is for bug fixes and conservative changes to the x.y.0 release, branch is for bug fixes and conservative changes to the x.y.0 release,
and is where we release x.y.z releases from. Creating the x.y branch and is where we create x.y.z releases from. Creating the x.y branch
opens up master for new development and lets new development move on. opens up master for new development and lets new development move on.
We've done this both after the x.y.0 release (to focus development on We've done this both after the x.y.0 release (to focus development on
bug fixing for the x.y.1 release for a little longer) or before the bug fixing for the x.y.1 release for a little longer) or before the
x.y.0 release (like we did with the 1.5.0 release, to unblock master x.y.0 release (like we did with the 1.5.0 release, to unblock master
development early). development early).
$ git branch x.y $ git branch x.y [sha]
$ git push origin x.y $ git push origin x.y
The master branch configure.ac version should always be (at least) The master branch configure.ac version should always be (at least)

Loading…
Cancel
Save