[pytest-dev] pytest-2.8 / new branches

2015-09-21 Thread holger krekel
Hey all, just changed CONTRIBUTING to reflect the pytest-2.8 reality: https://github.com/pytest-dev/pytest/pull/1038 In it i suggest we use a "2.8.X" branch for bugfixes of the 2.8 series and master for features. We could also think about using "bug" and "feature" as branch names to relieve

Re: [pytest-dev] pytest-2.8 / new branches

2015-09-21 Thread Bruno Oliveira
On Mon, Sep 21, 2015 at 9:10 AM holger krekel wrote: > Hey all, > > just changed CONTRIBUTING to reflect the pytest-2.8 reality: > > https://github.com/pytest-dev/pytest/pull/1038 > > In it i suggest we use a "2.8.X" branch for bugfixes of the 2.8 series > and master for features. We could a

Re: [pytest-dev] pytest-2.8 / new branches

2015-09-21 Thread holger krekel
On Mon, Sep 21, 2015 at 12:24 +, Bruno Oliveira wrote: > On Mon, Sep 21, 2015 at 9:10 AM holger krekel wrote: > > > Hey all, > > > > just changed CONTRIBUTING to reflect the pytest-2.8 reality: > > > > https://github.com/pytest-dev/pytest/pull/1038 > > > > In it i suggest we use a "2.8.X"

Re: [pytest-dev] pytest-2.8 / new branches

2015-09-21 Thread Bruno Oliveira
On Mon, Sep 21, 2015 at 9:40 AM holger krekel wrote: > So what about these branches: > > - master: bugfixes (for current latest pytest release) which will > usually be released in a new micro revision. > > - features: will result in a new minor or major revision. > > This satisfies these condit