From 71c5883d526dc5c05b258e3c71e184eb6f1092d3 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 22 Sep 2015 10:21:01 +0200 Subject: [PATCH] update according to discussion on pytest-dev and in PR --- CHANGELOG | 6 ++++++ CONTRIBUTING.rst | 14 +++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bab682ea9..f5e107f0f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,15 @@ x.y.z ----- +- (experimental) adapt more SEMVER style versioning and change meaning of + master branch in git repo: "master" branch now keeps the bugfixes, changes + aimed for micro releases. "features" branch will only be be released + with minor or macro pytest releases. + - Fix issue #766 by removing documentation references to distutils. Thanks Russel Winder. + 2.8.0 ----------------------------- diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 5315e0bf0..01c0768b9 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -151,9 +151,17 @@ but here is a simple overview: $ git clone git@github.com:YOUR_GITHUB_USERNAME/pytest.git $ cd pytest - $ git checkout 2.8.X # if you want to fix a bug for the pytest-2.8 series - $ git checkout master # if you want to add a feature bound for the next minor release - $ git branch your-branch-name # your feature/bugfix branch + # now, to fix a bug create your own branch off "master": + + $ git checkout master -b your-bugfix-branch-name + + # or to instead add a feature create your own branch off "features": + + $ git checkout features -b your-feature-branch-name + + Given we have "macro.minor.micro" version numbers, bugfixes will usually + be released in micro releases whereas features will be released in + minor releases and incompatible changes in major releases. If you need some help with Git, follow this quick start guide: https://git.wiki.kernel.org/index.php/QuickStart