[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 <nad at python.org> wrote:

> On May 28, 2018, at 17:42, Victor Stinner <vstinner at redhat.com> 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   |   ncoghlan at gmail.com   |   Brisbane, Australia
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-dev/attachments/20180529/64f4c30c/attachment.html>