andrew/versioners
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akesterson/versioners

Browse Source
This commit is contained in:
Andrew Kesterson
2013-05-16 21:56:06 -04:00
parent 0f819fb075 5eaf58373c
commit cae16188ff
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -16,11 +16,11 @@ This assumes you want your project versioned like this:
All builds will be tagged thusly: All builds will be tagged thusly:
(BRANCH),(MAJOR),(BUILD) build,(MAJOR),(BUILD)
If you want your project to use a MAJOR that is NOT equal to the branch name (e.g. you want branch 'master' to be '1.1'), then you must set an initial tag on that branch, e.g: If you want your project to use a MAJOR that is NOT equal to the branch name (e.g. you want branch 'master' to be '1.1'), then you must set an initial tag on that branch, e.g:
master,1.1,0 build,1.1,0
... And then the scripts will use 1.1, instead of 'master', as the MAJOR version component. ... And then the scripts will use 1.1, instead of 'master', as the MAJOR version component.
@@ -44,7 +44,7 @@ Generate a version
Two scripts, 'gitversion' and 'hgversion' generate version metadata for git and hg, respectively. The data output by these two is meant to be consumed by bash. Two scripts, 'gitversion' and 'hgversion' generate version metadata for git and hg, respectively. The data output by these two is meant to be consumed by bash.
[]$ hgversion []$ hgversion
TAG="6.3.0" TAG="build,6.3.0,0"
BRANCH="6.3.0" BRANCH="6.3.0"
MAJOR="6.3.0" MAJOR="6.3.0"
BUILD="0" BUILD="0"
@@ -72,4 +72,4 @@ To cut a tag, just run 'gittag' or 'hgtag':
* The current revision has already been tagged (e.g., this is just a rebuild) * The current revision has already been tagged (e.g., this is just a rebuild)
* The buildnumber that we were going to use has been tagged somewhere else on this branch * The buildnumber that we were going to use has been tagged somewhere else on this branch
* This is not marked as a rebuild, but someone else just tagged the version with the same build number we would have (e.g., distributed build systems) * This is not marked as a rebuild, but someone else just tagged the version with the same build number we would have (e.g., distributed build systems)