On 03/17/2014 04:23 PM, Nick Coghlan wrote:

On 18 Mar 2014 07:37, "Victor Stinner" <victor.stinner@gmail.com> wrote:
>
> Hi,
>
> I modified the Misc/NEWS file:
>
> * I moved 3.3 sections to Misc/HISTORY: items were already present,
> but the format in Misc/NEWS was improved (changeset 6ba468d4fa96)
> * I removed 3.4.1 section: changes of 3.4 after 3.4.0 must already be
> present in the 3.4 branch (changeset cb161cd94e6e)
>
> Is that correct?

Not everything was cherry picked, so we'll need to review that to move the 3.4.1 fixes back to the appropriate section.

I merged "default" into "3.4" (3a3a83195159), so every change that was in "default" last night will automatically go into 3.4.1. Stuff that got cherry-picked back for 3.4.0 should already be in their correct sections.

I worked pretty hard to get that right, so while I'd be interested to hear if I got it wrong, my assumption (my hope) for now is that Misc/NEWS is basically correct in both "3.4" and "default".

/arry