[python-committers] Guidance on merging(?)

[Serhiy Storchaka]

2016-05-08 16:18 GMT+03:00 Steven D'Aprano <steve at pearwood.info>:
> My hg skills are still fairly basic, and I'm looking for somebody who
> can mentor me (or at least point me in the right direction) with respect
> to making the same change across multiple versions of Python.
>
> I have just made a one-line change to the 3.6 (default) branch:
>
> https://hg.python.org/cpython/rev/2bf4a02f3570
>
> and I'll like to apply it to 3.4 and 3.5 as well. I'm not sure if this
> is the right language: is this called a merge?
>
> Can somebody point me at the right way to handle this? Last time I had a
> change to apply to all three versions, I manually applied it
> individually to each branch. I take it that's the wrong way to do it.

This is not security fix, thus it shouldn't be committed in 3.4.

You should now apply your patch to 3.5, commit it, merge the default
branch with 3.5 (this will be null merge) and push your changes to
main server.

For future, you should first commit your patch in 3.5, and then merge
it in default.