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

2015-08-17 Thread Barry Warsaw
On Aug 16, 2015, at 12:13 AM, Larry Hastings wrote: Can we pick one approach and stick with it? Pretty-please? I agree with the You're the RM, pick one sentiment, but just want to add a plea for *documenting* whatever you choose, preferably under a big red blinky banner in the devguide. ;) I

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

2015-08-16 Thread Larry Hastings
So far I've accepted two pull requests into bitbucket.com/larry/cpython350 in the 3.5 branch, what will become 3.5.0rc2. As usual, it's the contributor's responsibility to merge forward; if their checkin goes in to 3.5, it's their responsibility to also merge it into the

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

2015-08-16 Thread Guido van Rossum
I presume the issue here is that Hg is so complicated that everyone knows a different subset of the commands and semantics. I personally don't know what the commands for cherry-picking a revision would be. I also don't know exactly what happens when you merge a PR using bitbucket. (I'm only

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

2015-08-16 Thread Terry Reedy
On 8/16/2015 3:13 AM, Larry Hastings wrote: So far I've accepted two pull requests into bitbucket.com/larry/cpython350 in the 3.5 branch, what will become 3.5.0rc2. As usual, it's the contributor's responsibility to merge forward; if their checkin goes in to 3.5, it's their responsibility to

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

2015-08-16 Thread M.-A. Lemburg
On 16.08.2015 16:08, Guido van Rossum wrote: I presume the issue here is that Hg is so complicated that everyone knows a different subset of the commands and semantics. I personally don't know what the commands for cherry-picking a revision would be. I also don't know exactly what happens

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

2015-08-16 Thread Larry Hastings
On 08/16/2015 07:08 AM, Guido van Rossum wrote: I presume the issue here is that Hg is so complicated that everyone knows a different subset of the commands and semantics. I personally don't know what the commands for cherry-picking a revision would be. There are a couple. The command