[Python-Dev] [Python-checkins] cpython (merge default -> default): Merge heads default. (original) (raw)
Ezio Melotti ezio.melotti at gmail.com
Sat Mar 16 22:09:08 CET 2013
- Previous message: [Python-Dev] [PEP 437] A DSL for specifying signatures, annotations and argument converters
- Next message: [Python-Dev] [Python-checkins] cpython (merge default -> default): Merge heads default.
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Hi,
On Sat, Mar 16, 2013 at 10:08 PM, terry.reedy <python-checkins at python.org> wrote:
http://hg.python.org/cpython/rev/9a2f4418e65a changeset: 82699:9a2f4418e65a parent: 82691:0a15a58ac4a1 parent: 82695:533a60251b9d user: Terry Jan Reedy <tjreedy at udel.edu> date: Sat Mar 16 16:08:12 2013 -0400 summary: Merge heads default.
files: Doc/library/functions.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
You forgot a couple of merges here. 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 At least now that the worst case scenario that doesn't really happen often™0 happened I can point to some actual graphs that will hopefully clarify why all these merges are necessary :)
Best Regards, Ezio Melotti
- Previous message: [Python-Dev] [PEP 437] A DSL for specifying signatures, annotations and argument converters
- Next message: [Python-Dev] [Python-checkins] cpython (merge default -> default): Merge heads default.
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]