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

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

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

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 ___

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

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

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

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

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

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

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

> 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

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

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

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

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

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

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

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

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,

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

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

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

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 >

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

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

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

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"