This page describes the process of creating stdcxx release branches, and merging changes between them.
branches/<major>.<minor>.x
where <major>
and <minor>
and the major and minor version numbers, respectively, for the release. The letter x
denotes all micro versions. For example, branches/4.2.x is a branch for all of 4.2.0, 4.2.1, 4.2.2, and so on. Similarly, branches/4.3.x is a branch for all of 4.3.0, 4.3.1, etc.trunk
corresponds to the next major version in development. When it comes time to start the release process for the next major version, a new branch for the version is created. The name of the branch follows the naming convention listed above. For example, when it comes time to release version 5.0.0, branches/5.0.x
will be created off of trunk
. At that point, trunk
becomes the future 6.0.0.4.2.x
and 4.3.x
, and trunk
, changes that are both backward and forward compatible are first made on branches/4.2.x
and then merged to branches/4.3.x
and then to trunk
. Changes that are forward but not backward binary compatible are first made on branches/4.3.x
and then merged to trunk
. Incompatible changes are made only on trunk
.Log entry for each. An example of a such a Change
`Log entry is this commit.