X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/abe6c89607d903de961df368d638837dc938505f..f1f778e727253c88411d312eb5d6b9db07af6ee3:/docs/README.developers?ds=sidebyside diff --git a/docs/README.developers b/docs/README.developers index 8b9ecdf0..ec0b29d7 100644 --- a/docs/README.developers +++ b/docs/README.developers @@ -216,11 +216,18 @@ here; the convention for release candidates is to use something like % git branch 1.5-release - Note you are still on the master branch at this point. So mark that - master will now be post-1.5: + Note you are still on the master branch at this point. Mark the + current revision as the branchpoint for the new release branch: + + % git tag -a -m "This tag marks the point where we started the branch for 1.5" 1.5-branchpoint + + Now mark the master branch with a post-release version number (the + convention here is to use VERSION+dev as the version number). % echo 1.5+dev > VERSION - % git commit VERSION; git push + % git commit VERSION + % git push + % git push --tags Then do: @@ -235,6 +242,7 @@ here; the convention for release candidates is to use something like 3. % git commit VERSION DATE; git push 4. % git tag -a 1.5 -m 'Releasing nmh-1.5.' + % git push --tags Note that the new convention for tagging is to simply tag with the version number (tag formats in the past have varied).