[Pywps-dev] git branches confusion (mess)

[Tom Kralidis]

My proposal on Gitter was to keep master as the true dev branch and releasing stable branches on major releases. That seemed like overhead at the time and we agreed to go with a git-flow type model. Sometimes the 'master by default' thinking has PRs being issued to master by mistake.

What do folks think about:

- eliminating develop branch
- working off master as latest
- creating stable branches off major releases

Example for a major release:
- create x.y.z tag
- create x.y stable branch
- bug fixes are applied against master and x.y
- bug fix releases are made against x.y branch
- new features are applied against master

Thoughts?

..Tom

Sent from my iPhone

> On Sep 1, 2017, at 15:38, Jachym Cepicky <jachym.cepicky at gmail.com> wrote:
> 
> Hi,
> 
> I've just now put PyWPS `master` back to where it belongs 7cab386
> 
> Before I did , I merged the code which was added to master to `develop` branch - no code should be lost.
> 
> From now on, we have to carefully read, where the pull requests are supposed to be merged and not accept those pull requests, which are done against master.
> 
> Related to this:
> 
> I would suggest, we open our development policy one more time, seems, people are confused about the fact, that master is stable and not development branch. @TomKralidis had some alternative proposal on Gitter, maybe it could be shared in the mailing list, I would like to have PSC decided about this.
> 
> J
> 
> pá 1. 9. 2017 v 15:43 odesílatel Luí­s Moreira de Sousa <luis.de.sousa at protonmail.ch> napsal:
>> Hi Jachym, that sounds good. But which commits exactly were pushed to the master branch? Depending on that we could have a minor odd release as Jorge suggests.
>> 
>> Cheers.
>> 
>> -- 
>> Luís Moreira de Sousa
>> Im Grund 6
>> CH-8600 Dübendorf
>> Switzerland
>> 
>> Phone: +41 (0)79 812 62 65
>> Email: luis.de.sousa at protonmail.ch
>> URL: https://sites.google.com/site/luismoreiradesousa
>> 
>> 
>>> -------- Original Message --------
>>> Subject: Re: [Pywps-dev] git branches confusion (mess)
>>> Local Time: August 31, 2017 9:16 AM
>>> UTC Time: August 31, 2017 7:16 AM
>>> From: jorge.dejesus at geocat.net
>>> To: Jachym Cepicky <jachym.cepicky at gmail.com>, pywps-dev at lists.osgeo.org <pywps-dev at lists.osgeo.org>
>>> 
>>> 
>>> Hi to all
>>> 
>>> I am more in favor of 1 :), but maybe do a pywps 4.0.1 release?
>>> 
>>> J.
>>> 
>>>> On 28-08-17 07:34, Jachym Cepicky wrote:
>>>> Hi all, 
>>>> 
>>>> seems, we have pushed to `master` instead of to `develop` ? 
>>>> 
>>>> Suggestions? 
>>>> 
>>>> I would do:
>>>> 
>>>> 1 - merge master to develop
>>>> 2 - reset master back to where it was (pywps-4.0.0)
>>>> 
>>>> J
>>>> 
>>>> 
>>>> _______________________________________________
>>>> pywps-dev mailing list
>>>> pywps-dev at lists.osgeo.org
>>>> https://lists.osgeo.org/mailman/listinfo/pywps-dev
>> 
> _______________________________________________
> pywps-dev mailing list
> pywps-dev at lists.osgeo.org
> https://lists.osgeo.org/mailman/listinfo/pywps-dev
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/pywps-dev/attachments/20170902/bcebb44f/attachment.html>