Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Victor Stinner]

2018-05-29 22:12 GMT+02:00 Miro Hrončok :
> On 29.5.2018 22:01, Victor Stinner wrote:
>>
>> GitHub provides a [Update branch] button. It seems like the button
>> does a rebase, no?
>
>
> AFAIK it merges the traget branch to the PR branch. No rebase.

Oh right! And it's the good option :-) Rebase cause confusions in
reviews. Merge are fine for reviews.

Victor
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Miro Hrončok]

On 29.5.2018 22:01, Victor Stinner wrote:

GitHub provides a [Update branch] button. It seems like the button
does a rebase, no?


AFAIK it merges the traget branch to the PR branch. No rebase.

--
Miro Hrončok
--
Phone: +420777974800
IRC: mhroncok
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Victor Stinner]

GitHub provides a [Update branch] button. It seems like the button
does a rebase, no?

Victor

2018-05-29 18:24 GMT+02:00 Matthias Bussonnier :
> On Tue, 29 May 2018 at 08:43, Paul G  wrote:
>>
>> This doesn't seem like the best idea, since it would kick off dozens or
>> hundreds of builds for every commit to the master branch.
>
>
> Sorry if I was unclear, I was not suggesting to do that for PRs against
> master, but do that only for 2.7, 3.4 and 3.5 only. (or Branch having
> "Require branches to be up to date before merging ")
> For these there is likely only a couple of open PRs, and it won't kick more
> jobs than if the author had to rebase and push by themselves.
>
> If you still think it's too much or triggered too often, you can also just
> have a tag "Miss-islington please rebase", which is often easier to apply
> manually, than having to do that by yourself on the Command line.
>
> --
> M
>
> ___
> Python-Dev mailing list
> Python-Dev@python.org
> https://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe:
> https://mail.python.org/mailman/options/python-dev/vstinner%40redhat.com
>
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Matthias Bussonnier]

On Tue, 29 May 2018 at 08:43, Paul G  wrote:

> This doesn't seem like the best idea, since it would kick off dozens or
> hundreds of builds for every commit to the master branch.
>

Sorry if I was unclear, I was not suggesting to do that for PRs against
master, but do that only for 2.7, 3.4 and 3.5 only. (or Branch having "Require
branches to be up to date before merging ")
For these there is likely only a couple of open PRs, and it won't kick more
jobs than if the author had to rebase and push by themselves.

If you still think it's too much or triggered too often, you can also just
have a tag "Miss-islington please rebase", which is often easier to apply
manually, than having to do that by yourself on the Command line.

-- 
M
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Paul G]

This doesn't seem like the best idea, since it would kick off dozens or 
hundreds of builds for every commit to the master branch.

On 05/29/2018 11:25 AM, Matthias Bussonnier wrote:
>> As I wrote, it became very difficult to merge any PR on 2.7 because of
>> that. We all run a race to be the first one to merge a change into
>> 2.7. The next one will get a "conflict" even if the merged commit is
>> unrelated (as I described: two different unrelated directories).
> 
> Couldn't miss-islington be configured to automatically rebase those (when
> there is no actual conflict). The "Allow edit from maintainer" would most
> likely permit to push on the PRs branch.
> 
> 
> 
> ___
> Python-Dev mailing list
> Python-Dev@python.org
> https://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe: 
> https://mail.python.org/mailman/options/python-dev/paul%40ganssle.io
> 



signature.asc
Description: OpenPGP digital signature
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Matthias Bussonnier]

> As I wrote, it became very difficult to merge any PR on 2.7 because of
> that. We all run a race to be the first one to merge a change into
> 2.7. The next one will get a "conflict" even if the merged commit is
> unrelated (as I described: two different unrelated directories).

Couldn't miss-islington be configured to automatically rebase those (when
there is no actual conflict). The "Allow edit from maintainer" would most
likely permit to push on the PRs branch.
-- 
M

On Tue, 29 May 2018 at 05:26, Nick Coghlan  wrote:

> On 29 May 2018 at 08:52, Ned Deily  wrote:
>
>> On May 28, 2018, at 17:42, Victor Stinner  wrote:
>> > Please use the same configuration for 2.7, 3.6, 3.7 and master branches!
>>
>> Sounds reasonable. I've updated the 2.7 configuration to match the others
>> and not require the PR branch be up to date before merging, meaning the CI
>> test might be against an older view of the branch.  If it proves to be a
>> problem, we can revisit it for all of the branches.  I am not going to
>> change the settings for 3.5 and 3.4 as they are in security-fix mode and
>> only their release manager can merge changes for those.
>>
>
> Turning the setting on for security-fix branches sounds like a good idea
> to me, since it's basically a "stability-of-target-branch vs
> ease-of-merging" trade-off: by setting it, you ensure that your pre-merge
> CI checks reflect the state of the post-merge branch, whereas the default
> setting means your post-merge branch state represents a never-before-tested
> combination of software.
>
> The default state works pretty well for us since we don't kick off test
> runs on the BuildBot fleet for every PR, so there's always some additional
> testing that only happens post-merge anyway.
>
> Cheers,
> Nick.
>
> --
> Nick Coghlan   |   ncogh...@gmail.com   |   Brisbane, Australia
> ___
> Python-Dev mailing list
> Python-Dev@python.org
> https://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe:
> https://mail.python.org/mailman/options/python-dev/bussonniermatthias%40gmail.com
>
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Nick Coghlan]

On 29 May 2018 at 08:52, Ned Deily  wrote:

> On May 28, 2018, at 17:42, Victor Stinner  wrote:
> > Please use the same configuration for 2.7, 3.6, 3.7 and master branches!
>
> Sounds reasonable. I've updated the 2.7 configuration to match the others
> and not require the PR branch be up to date before merging, meaning the CI
> test might be against an older view of the branch.  If it proves to be a
> problem, we can revisit it for all of the branches.  I am not going to
> change the settings for 3.5 and 3.4 as they are in security-fix mode and
> only their release manager can merge changes for those.
>

Turning the setting on for security-fix branches sounds like a good idea to
me, since it's basically a "stability-of-target-branch vs ease-of-merging"
trade-off: by setting it, you ensure that your pre-merge CI checks reflect
the state of the post-merge branch, whereas the default setting means your
post-merge branch state represents a never-before-tested combination of
software.

The default state works pretty well for us since we don't kick off test
runs on the BuildBot fleet for every PR, so there's always some additional
testing that only happens post-merge anyway.

Cheers,
Nick.

-- 
Nick Coghlan   |   ncogh...@gmail.com   |   Brisbane, Australia
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Ned Deily]

On May 28, 2018, at 17:42, Victor Stinner  wrote:
> 2018-05-28 19:47 GMT+02:00 Ned Deily :
>> Hmm, for some some reason, it appears that, at the moment, the 2.7, 3.4, and 
>> 3.5 branches have that option set, while 3.6, 3.7, and master don't.  I'm 
>> not sure how we got to that state.  Any other reasons to prefer on versus 
>> off?
> 
> As I wrote, it became very difficult to merge any PR on 2.7 because of
> that. We all run a race to be the first one to merge a change into
> 2.7. The next one will get a "conflict" even if the merged commit is
> unrelated (as I described: two different unrelated directories).
> 
> Please use the same configuration for 2.7, 3.6, 3.7 and master branches!

Sounds reasonable. I've updated the 2.7 configuration to match the others and 
not require the PR branch be up to date before merging, meaning the CI test 
might be against an older view of the branch.  If it proves to be a problem, we 
can revisit it for all of the branches.  I am not going to change the settings 
for 3.5 and 3.4 as they are in security-fix mode and only their release manager 
can merge changes for those.

--
  Ned Deily
  n...@python.org -- []

___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Victor Stinner]

2018-05-28 19:47 GMT+02:00 Ned Deily :
> Hmm, for some some reason, it appears that, at the moment, the 2.7, 3.4, and 
> 3.5 branches have that option set, while 3.6, 3.7, and master don't.  I'm not 
> sure how we got to that state.  Any other reasons to prefer on versus off?

As I wrote, it became very difficult to merge any PR on 2.7 because of
that. We all run a race to be the first one to merge a change into
2.7. The next one will get a "conflict" even if the merged commit is
unrelated (as I described: two different unrelated directories).

Please use the same configuration for 2.7, 3.6, 3.7 and master branches!

Victor
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Ned Deily]

On May 28, 2018, at 13:19, Nathaniel Smith  wrote:
> 
> Isn't that what happens if someone enables the check box at Repository 
> Settings -> Branches -> Branch protection rules -> [pick a branch] -> Require 
> branches to be up to date before merging ?

Hmm, for some some reason, it appears that, at the moment, the 2.7, 3.4, and 
3.5 branches have that option set, while 3.6, 3.7, and master don't.  I'm not 
sure how we got to that state.  Any other reasons to prefer on versus off?

On Mon, May 28, 2018, 09:11 Brett Cannon  wrote:
> Ryan is right that there's no special setting in GitHub at least which would 
> make merging more strict for certain branches as you're describing.
> 
> On Mon, 28 May 2018 at 07:06 Ryan Gonzalez  wrote:
> AFAIK there's no setting like this available, and I've done this many times 
> on other repos with no trouble. Maybe it could be a GitHub bug?
> 
> On May 28, 2018 4:59:03 AM Victor Stinner  wrote:
> 
> > Hi,
> >
> > Since one or two weeks, I noticed that it's difficult to merge pull
> > requests into the 2.7 branch. If a different commit is pushed in the
> > meanwhile (if a different PR has been merged), the 2.7 branch diverges
> > and the PR is immediately marked as "This branch is out-of-date with
> > the base branch" and the "Squash and Merge" button is disabled (grey).
> >
> > For example my PR https://github.com/python/cpython/pull/7120 which
> > changes Lib/test/regrtest.py cannot be merged because a commit
> > touching the documentation (Doc/ directory) has been merged after I
> > posted my PR and before the CI completed.
> >
> > I don't see the same behavior on the master branch. Is the 2.7 branch
> > configured as more strict?

--
  Ned Deily
  n...@python.org -- []

___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Nathaniel Smith]

Isn't that what happens if someone enables the check box at Repository
Settings -> Branches -> Branch protection rules -> [pick a branch] ->
Require branches to be up to date before merging ?

On Mon, May 28, 2018, 09:11 Brett Cannon  wrote:

> Ryan is right that there's no special setting in GitHub at least which
> would make merging more strict for certain branches as you're describing.
>
> On Mon, 28 May 2018 at 07:06 Ryan Gonzalez  wrote:
>
>> AFAIK there's no setting like this available, and I've done this many
>> times
>> on other repos with no trouble. Maybe it could be a GitHub bug?
>>
>>
>> On May 28, 2018 4:59:03 AM Victor Stinner  wrote:
>>
>> > Hi,
>> >
>> > Since one or two weeks, I noticed that it's difficult to merge pull
>> > requests into the 2.7 branch. If a different commit is pushed in the
>> > meanwhile (if a different PR has been merged), the 2.7 branch diverges
>> > and the PR is immediately marked as "This branch is out-of-date with
>> > the base branch" and the "Squash and Merge" button is disabled (grey).
>> >
>> > For example my PR https://github.com/python/cpython/pull/7120 which
>> > changes Lib/test/regrtest.py cannot be merged because a commit
>> > touching the documentation (Doc/ directory) has been merged after I
>> > posted my PR and before the CI completed.
>> >
>> > I don't see the same behavior on the master branch. Is the 2.7 branch
>> > configured as more strict?
>> >
>> > Victor
>> > ___
>> > Python-Dev mailing list
>> > Python-Dev@python.org
>> > https://mail.python.org/mailman/listinfo/python-dev
>> > Unsubscribe:
>> > https://mail.python.org/mailman/options/python-dev/rymg19%40gmail.com
>>
>>
>> ___
>> Python-Dev mailing list
>> Python-Dev@python.org
>> https://mail.python.org/mailman/listinfo/python-dev
>> Unsubscribe:
>> https://mail.python.org/mailman/options/python-dev/brett%40python.org
>>
> ___
> Python-Dev mailing list
> Python-Dev@python.org
> https://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe:
> https://mail.python.org/mailman/options/python-dev/njs%40pobox.com
>
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Brett Cannon]

Ryan is right that there's no special setting in GitHub at least which
would make merging more strict for certain branches as you're describing.

On Mon, 28 May 2018 at 07:06 Ryan Gonzalez  wrote:

> AFAIK there's no setting like this available, and I've done this many
> times
> on other repos with no trouble. Maybe it could be a GitHub bug?
>
>
> On May 28, 2018 4:59:03 AM Victor Stinner  wrote:
>
> > Hi,
> >
> > Since one or two weeks, I noticed that it's difficult to merge pull
> > requests into the 2.7 branch. If a different commit is pushed in the
> > meanwhile (if a different PR has been merged), the 2.7 branch diverges
> > and the PR is immediately marked as "This branch is out-of-date with
> > the base branch" and the "Squash and Merge" button is disabled (grey).
> >
> > For example my PR https://github.com/python/cpython/pull/7120 which
> > changes Lib/test/regrtest.py cannot be merged because a commit
> > touching the documentation (Doc/ directory) has been merged after I
> > posted my PR and before the CI completed.
> >
> > I don't see the same behavior on the master branch. Is the 2.7 branch
> > configured as more strict?
> >
> > Victor
> > ___
> > Python-Dev mailing list
> > Python-Dev@python.org
> > https://mail.python.org/mailman/listinfo/python-dev
> > Unsubscribe:
> > https://mail.python.org/mailman/options/python-dev/rymg19%40gmail.com
>
>
> ___
> Python-Dev mailing list
> Python-Dev@python.org
> https://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe:
> https://mail.python.org/mailman/options/python-dev/brett%40python.org
>
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Ryan Gonzalez]

AFAIK there's no setting like this available, and I've done this many times 
on other repos with no trouble. Maybe it could be a GitHub bug?



On May 28, 2018 4:59:03 AM Victor Stinner  wrote:


Hi,

Since one or two weeks, I noticed that it's difficult to merge pull
requests into the 2.7 branch. If a different commit is pushed in the
meanwhile (if a different PR has been merged), the 2.7 branch diverges
and the PR is immediately marked as "This branch is out-of-date with
the base branch" and the "Squash and Merge" button is disabled (grey).

For example my PR https://github.com/python/cpython/pull/7120 which
changes Lib/test/regrtest.py cannot be merged because a commit
touching the documentation (Doc/ directory) has been merged after I
posted my PR and before the CI completed.

I don't see the same behavior on the master branch. Is the 2.7 branch
configured as more strict?

Victor
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/rymg19%40gmail.com



___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

[Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Victor Stinner]

Hi,

Since one or two weeks, I noticed that it's difficult to merge pull
requests into the 2.7 branch. If a different commit is pushed in the
meanwhile (if a different PR has been merged), the 2.7 branch diverges
and the PR is immediately marked as "This branch is out-of-date with
the base branch" and the "Squash and Merge" button is disabled (grey).

For example my PR https://github.com/python/cpython/pull/7120 which
changes Lib/test/regrtest.py cannot be merged because a commit
touching the documentation (Doc/ directory) has been merged after I
posted my PR and before the CI completed.

I don't see the same behavior on the master branch. Is the 2.7 branch
configured as more strict?

Victor
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com