[Python-checkins] cpython (merge default -> default): Merge heads default.

[Terry Reedy]

> You forgot a couple of merges here.

Yep. I forgot and also did not re-read *all* the faq, pushed, and then 
remembered. Fortunately, after starting the 3.2 to 3.3 merge, I 
remembered to pull again before committing (and I was able to undo the 
local merge-in-progress).

> If you look at the graph at
> http://hg.python.org/cpython/graph/9a2f4418e65a you will see that all
> the heads in the individual branches got merged, but then you forgot
> to merge 3.2 -> 3.3 -> default (i.e. steps 5 and 6 of
> http://bugs.python.org/issue14468#msg184130).  Serhiy fixed that
> shortly after: http://hg.python.org/cpython/graph/5da005db8166

The FAQ says "...  using hg merge 3.3 as usual." Serhiy's commit message 
said 'Null merge', which to me is not 'as usual', as there are extra 
steps given in the FAQ above. So, do he really do a 'null merge' and is 
that the right thing to do in this situation?

I have no doubt the the extra merges are needed ;-).