git branches confusion (mess)

Next Topic
 
classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

git branches confusion (mess)

Jachym Cepicky
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
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev
Reply | Threaded
Open this post in threaded view
|

Re: git branches confusion (mess)

Jorge Mendes de Jesus

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
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev


_______________________________________________
pywps-dev mailing list
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev
Reply | Threaded
Open this post in threaded view
|

Re: git branches confusion (mess)

Luí­s Moreira de Sousa
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


-------- 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


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
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev


_______________________________________________
pywps-dev mailing list
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev
Reply | Threaded
Open this post in threaded view
|

Re: git branches confusion (mess)

Jachym Cepicky
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 <[hidden email]> 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: <a href="tel:+41%2079%20812%2062%2065" value="+41798126265" target="_blank">+41 (0)79 812 62 65


-------- 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


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
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev


_______________________________________________
pywps-dev mailing list
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev
Reply | Threaded
Open this post in threaded view
|

Re: git branches confusion (mess)

tomkralidis
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 <[hidden email]> 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 <[hidden email]> 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: <a href="tel:+41%2079%20812%2062%2065" value="+41798126265" target="_blank">+41 (0)79 812 62 65


-------- 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


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
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev

_______________________________________________
pywps-dev mailing list
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev

_______________________________________________
pywps-dev mailing list
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev
Reply | Threaded
Open this post in threaded view
|

Re: git branches confusion (mess)

Luí­s Moreira de Sousa
Hi all, my thoughts:

What Tom proposes is essentially to use branches instead of tags for code releases. This is in my view a misuse of the system, and at odds with the recommendations from the GitHub people themselves [0]. Marking releases with branches creates three sets of issues:

1. The number of branches increases fast, making the GitHub interface harder to use and complicate branch management in the development environment.

2. Releases become attached to a perishable asset: it is very easy to delete a branch by mistake. In contrast there is no way to delete a tag in the GitHub interface - they were thought to be permanent.

3. A larger number of branches increases the likelihood of pull requests committed against the wrong branch.

For the particular issue at hand I believe the solution is to restrict the branch(es) against which pull requests can be issued. I do not know yet if or how is this possible, I opened a thread about it at StackOverflow [1]. Another thing that can be done right away is to protect the master branch [2], which forces additional checks before pull requests can be merged.

Cheers.


--
Luís Moreira de Sousa
Im Grund 6
CH-8600 Dübendorf
Switzerland

Phone: +41 (0)79 812 62 65


-------- Original Message --------
Subject: Re: [Pywps-dev] git branches confusion (mess)
Local Time: September 2, 2017 7:11 PM
UTC Time: September 2, 2017 5:11 PM
To: Jachym Cepicky <[hidden email]>
Luí­s Moreira de Sousa <[hidden email]>, jorge.dejesus <[hidden email]>, [hidden email] <[hidden email]>

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 <[hidden email]> 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 <[hidden email]> 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: <a value="+41798126265" href="tel:+41%2079%20812%2062%2065">+41 (0)79 812 62 65


-------- 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


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
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev

_______________________________________________
pywps-dev mailing list


_______________________________________________
pywps-dev mailing list
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev
Reply | Threaded
Open this post in threaded view
|

Re: git branches confusion (mess)

Tom Kralidis

Hi Luís: comments interleaved.

On Tue, 5 Sep 2017, Luí­s Moreira de Sousa wrote:

> Date: Tue, 05 Sep 2017 08:14:02 -0400
> From: Luí­s Moreira de Sousa <[hidden email]>
> To: Tom Kralidis <[hidden email]>
> Cc: Jachym Cepicky <[hidden email]>,
>     jorge.dejesus <[hidden email]>,
>     "[hidden email]" <[hidden email]>
> Subject: Re: [Pywps-dev] git branches confusion (mess)
>
> Hi all, my thoughts:
>
> What Tom proposes is essentially to use branches instead of tags for code releases. This is in my view a misuse of the system, and at odds with the recommendations from the GitHub people themselves [0]. Marking releases with branches creates three sets of issues:
>

Isn't master a branch itself? Any release is based on a branch and requires a tag.

> 1. The number of branches increases fast, making the GitHub interface harder to use and complicate branch management in the development environment.

I would say this becomes easier.  Branches are created against minor releases.  Bugfix releases are created against minor release branches.

>
> 2. Releases become attached to a perishable asset: it is very easy to delete a branch by mistake. In contrast there is no way to delete a tag in the GitHub interface - they were thought to be permanent.

How does one delete a branch in the GitHub interface?  Tags are easily deleted via git command line.

>
> 3. A larger number of branches increases the likelihood of pull requests committed against the wrong branch.

Disgree; we have had commits being applied to the wrong branch with the current setup.  Keeping master as the default branch with most people's Git mindsets being "master is default" prevents issues like applying changes to the wrong branch.

>
> For the particular issue at hand I believe the solution is to restrict the branch(es) against which pull requests can be issued. I do not know yet if or how is this possible, I opened a thread about it at StackOverflow [1]. Another thing that can be done right away is to protect the master branch [2], which forces additional checks before pull requests can be merged.
>
> Cheers.
>
> [0] https://help.github.com/articles/creating-releases/
> [1] https://stackoverflow.com/questions/46054696/restricting-branches-to-which-pull-requests-can-be-issued
> [2] https://help.github.com/articles/defining-the-mergeability-of-pull-requests/
>
> --
> Luís Moreira de Sousa
> Im Grund 6
> CH-8600 Dübendorf
> Switzerland
>
> Phone: +41 (0)79 812 62 65
> Email: [hidden email]
> URL: https://sites.google.com/site/luismoreiradesousa
>
>> -------- Original Message --------
>> Subject: Re: [Pywps-dev] git branches confusion (mess)
>> Local Time: September 2, 2017 7:11 PM
>> UTC Time: September 2, 2017 5:11 PM
>> From: [hidden email]
>> To: Jachym Cepicky <[hidden email]>
>> Luí­s Moreira de Sousa <[hidden email]>, jorge.dejesus <[hidden email]>, [hidden email] <[hidden email]>
>>
>> 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 <[hidden email]> 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 <[hidden email]> 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](tel:+41%2079%20812%2062%2065)
>>>> Email: [hidden email]
>>>> 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: [hidden email]
>>>>> To: Jachym Cepicky <[hidden email]>, [hidden email] <[hidden email]>
>>>>>
>>>>> 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
>>>>>> [hidden email]
>>>>>>
>>>>>> https://lists.osgeo.org/mailman/listinfo/pywps-dev
>>
>>> _______________________________________________
>>> pywps-dev mailing list
>>> [hidden email]
>>> https://lists.osgeo.org/mailman/listinfo/pywps-dev
_______________________________________________
pywps-dev mailing list
[hidden email]
https://lists.osgeo.org/mailman/listinfo/pywps-dev