Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fslpy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michiel Cottaar
fslpy
Commits
b9e9d64c
Commit
b9e9d64c
authored
7 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
Updated contributing guide r.e. version number
parent
7bb76473
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
doc/contributing.rst
+9
-11
9 additions, 11 deletions
doc/contributing.rst
with
9 additions
and
11 deletions
doc/contributing.rst
+
9
−
11
View file @
b9e9d64c
...
@@ -29,25 +29,26 @@ Releases
...
@@ -29,25 +29,26 @@ Releases
A separate branch is created for each release. The name of the branch is
A separate branch is created for each release. The name of the branch is
``v[release]``, where ``[release]`` is the version number (see
below). For
``v[release]``, where ``[release]`` is the
``major.minor``
version number (see
example, the branch name for release ``1.0
.0
`` would be ``v1.0
.0
``.
Hotfixes
below). For
example, the branch name for release ``1.0`` would be ``v1.0``.
may be added to these release branches. Hotfixes should be merged
into the
Hotfixes
may be added to these release branches. Hotfixes should be merged
master branch, and then cherry-picked onto the release branch(es).
into the
master branch, and then cherry-picked onto the release branch(es).
Every release (including hotfixes) is also tagged with its version number.
Every release (including hotfixes) is also tagged with its version number.
For example, the first commit in the ``v1.0.0`` branch would also be tagged
For example, the first commit in the ``v1.0`` branch would also be tagged with
with ``1.0.0``.
``1.0``. A maintenance release to the ``v1.0`` branch would be tagged with
``1.0.1``.
Version number
Version number
--------------
--------------
The ``fslpy`` version number follows `semantic versioning
The ``fslpy`` version number
roughly
follows `semantic versioning
<http://semver.org/>`_ rules, so that dependant projects are able to perform
<http://semver.org/>`_ rules, so that dependant projects are able to perform
compatibility testing. The full version number string consists of three
compatibility testing. The full version number string consists of three
numbers:
:
numbers:
major.minor.patch
major.minor.patch
...
@@ -60,9 +61,6 @@ numbers::
...
@@ -60,9 +61,6 @@ numbers::
- The ``major`` number is incremented on major feature additions, and
- The ``major`` number is incremented on major feature additions, and
backwards-incompatible changes.
backwards-incompatible changes.
Additionally, a single letter (``a``, ``b``, ``c``, etc) may be appended
to the version number, indicating a hotfix release.
Testing
Testing
-------
-------
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment