Home Original page

[python-committers] [Python-Dev] How are we merging forward from the Bitbucket 3.5 repo?

R. David Murray rdmurray at bitdance.com
Sun Aug 16 17:43:24 CEST 2015 
On Sun, 16 Aug 2015 11:24:32 -0400, "R. David Murray" <rdmurray at bitdance.com> wrote:
> On Sun, 16 Aug 2015 00:13:10 -0700, Larry Hastings <larry at hastings.org> wrote:
> >  3. After your push request is merged, you pull from
> >     bitbucket.com/larry/cpython350 into hg.python.org/cpython and merge
> >     into 3.5.  In this version I don't have to do a final null merge!
> > 
> > I'd prefer 3; that's what we normally do, and that's what I was 
> > expecting.  So far people have done 1 and 2.

Thinking about this some more I realize why I was confused.  My
patch/pull request was something that got committed to 3.4.  In that
case, to follow your 3 I'd have to leave 3.4 open until you merged the
pull request, and that goes against our normal workflow.

Maybe my patch will be the only exception...

--David
More information about the python-committers mailing list