On Sun, May 8, 2016 at 4:18 PM, Steven D'Aprano <st...@pearwood.info> wrote: > Hi, > > 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?
Hi Steven, Since 2bf4a02f3570 is not a security fix, it can only go into 3.5 and default branches. See https://docs.python.org/devguide/index.html#status-of-python-branches for details. > 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. I'd suggest the following steps: $ hg update 3.5 # make the change in Lib/statistics.py $ hg commit $ hg update default # since the change is already in the default branch, we need to make a null merge $ hg merge 3.5 $ hg revert -ar default # if you can see merge conflicts, you can run the following command (optional) $ hg resolve -am # we can now commit $ hg commit $ hg push A little bit detailed version of this can be found at https://docs.python.org/devguide/faq.html#how-do-i-make-a-null-merge --Berker _______________________________________________ python-committers mailing list python-committers@python.org https://mail.python.org/mailman/listinfo/python-committers Code of Conduct: https://www.python.org/psf/codeofconduct/
