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

2013-03-16 Thread Ezio Melotti
Hi, On Sat, Mar 16, 2013 at 10:08 PM, terry.reedy python-check...@python.org wrote: http://hg.python.org/cpython/rev/9a2f4418e65a changeset: 82699:9a2f4418e65a parent: 82691:0a15a58ac4a1 parent: 82695:533a60251b9d user:Terry Jan Reedy tjre...@udel.edu date:Sat

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

2013-03-16 Thread Ezio Melotti
On Sat, Mar 16, 2013 at 11:48 PM, Terry Reedy tjre...@udel.edu wrote: 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