[Pywps-dev] New branching method - for PSC approval

[Luí­s Moreira de Sousa]

Hi Tom,

I already modified docs/development.rst. I will update the other two .rst files and put everything in the same pull request.

A side question: why do we need contributing guidelines on RTD and the blob?

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] New branching method - for PSC approval
Local Time: December 30, 2016 1:03 PM
UTC Time: December 30, 2016 12:03 PM
From: tomkralidis at gmail.com
To: Jonas Eberle <jonas.eberle at gmx.de>
pywps-dev at lists.osgeo.org


Hi Luís:

On Fri, 30 Dec 2016, Jonas Eberle wrote:

> Date: Fri, 30 Dec 2016 05:20:43 -0600 (CST)
> From: Jonas Eberle <jonas.eberle at gmx.de>
> To: pywps-dev at lists.osgeo.org
> Subject: Re: [Pywps-dev] New branching method - for PSC approval
>
> +1, sounds good.
>
> Cheers,
> Jonas
>
> ----- Am 30. Dez 2016 um 12:11 schrieb Luí­s Moreira de Sousa <luis.de.sousa at protonmail.ch>:
>
>> Dear all, I hope you had a merry Christmas.
>
>> I would like to implement the branching method we discussed some time ago [0].
>> develop becomes the main development branch and master tracks exclusively
>> released code. I already modified the guidelines with up to date instructions
>> for the develop branch.

Is there a URL for review?

>
>> The most noticeable difference in this system is that all pull requests must
>> made against the develop branch. We only merge with master for a new release.
>
>> If this is OK with everyone I will then set a date for the main branch shift
>> from master to develop.

I'm supportive as long as/once there is clear documentation in places like:

- https://github.com/geopython/pywps/blob/master/CONTRIBUTING.rst
- https://github.com/geopython/pywps/blob/master/RELEASE-howto.md
- https://github.com/geopython/pywps/blob/master/docs/development.rst
- other?

Cheers

..Tom


>
>> Cheers.
>
>> [0] http://nvie.com/posts/a-successful-git-branching-model/
>
>> --
>> 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
>
>> _______________________________________________
>> pywps-dev mailing list
>> pywps-dev at lists.osgeo.org
>> http://lists.osgeo.org/mailman/listinfo/pywps-dev
_______________________________________________
pywps-dev mailing list
pywps-dev at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/pywps-dev
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/pywps-dev/attachments/20161230/ceb49590/attachment-0001.html>