diff options
author | Robert Collins <rbtcollins@hp.com> | 2014-03-14 15:05:18 +1300 |
---|---|---|
committer | Robert Collins <rbtcollins@hp.com> | 2014-08-14 16:58:11 +1200 |
commit | 81c200088198fb9c73e32bae23e021b7c27016aa (patch) | |
tree | acff4a6f965fade75b213e731db3518779425148 /doc | |
parent | 1758998881ef5e3c81a76910755ce1e33688b9e0 (diff) | |
download | pbr-81c200088198fb9c73e32bae23e021b7c27016aa.tar.gz |
Teach pbr about post versioned dev versions.
Untagged versions should not be presented as final versions, which is
what was happening. The rules for dev versions are that they lead up
to the next release, so to emit a dev version we have to increment
the current version, then we can emit a dev version number.
implements: blueprint pbr-semver
sem-ver: feature
Change-Id: Icf2f1999613e0d26424798697de34811b9cfc4ab
Diffstat (limited to 'doc')
-rw-r--r-- | doc/source/index.rst | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/doc/source/index.rst b/doc/source/index.rst index 0385fd1..6cd5e8b 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -26,11 +26,17 @@ PBR can and does do a bunch of things for you: Version ------- -Version strings will be inferred from git. If a given revision is tagged, -that's the version. If it's not, and you don't provide a version, the version -will be very similar to git describe. If you do, then we'll assume that's the -version you are working towards, and will generate alpha version strings -based on commits since last tag and the current git sha. +Versions can be managed two ways - postversioning and preversioning. +Postversioning is the default, and preversioning is enabeld by setting +``version`` in the setup.cfg ``metadata`` section. In both cases +version strings are inferred from git. + +If a given revision is tagged, that's the version. If it's not, then either +the current version is incremented to get a target version (postversioning) or +the version set in setup.cfg metadata (preversioning) is used as the target +version. We then generate dev version strings based on the commits since the +last release and include the current git sha to disambiguate multiple dev +versions with the same number of commits since the release. .. note:: |