Commit graph

5 commits

Author SHA1 Message Date
Gina Häußge
50a62bf00a maintenance branch is now 1.2.3-dev 2015-06-30 21:49:37 +02:00
Gina Häußge
0b3f94b6bd maintenance branch is now 1.2.2-dev 2015-06-30 10:12:14 +02:00
Gina Häußge
69e5f137a6 Devel is now 1.3
(cherry picked from commit dd5bf2e)
2015-06-25 11:03:56 +02:00
Gina Häußge
a0f2079fb5 maintenance branch is 1.2.1-dev for now
This branch is for preparing the next patch-releases of the current
stable release on the master branch.
2015-06-25 11:02:33 +02:00
Gina Häußge
212f40cd1a Modified versioneer to allow specification of manual versions based on branches
You can now define a lookup file explicitely mapping virtual version tags to branches via regular expressions and a reference commit from which the commit distance will be calculated.

Format of the file is

  <branch-regex> <tag> <reference commit>

The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out, the lookup table does not apply to the matched branches and the regular versioneer resolution (via git describe) takes place.

Current configuration makes "master", "staging" and any branch starting with "fix/" make use the default behaviour, all other branches (so basically all development branches) are defined as "1.2.0-dev"
2014-09-02 11:35:42 +02:00