[Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

[Guido van Rossum]

On Sat, Mar 19, 2011 at 12:55 PM, "Martin v. Löwis" <martin at v.loewis.de> wrote:
> So I'd encourage everybody to keep asking questions, and request that
> they are answered in a polite manner, even if the one answering thinks
> that the same question is already answered in some documentation.

Thanks. I have some basic questions.

> The only alternative is that some people just give up contributing
> to Python.

I was about to do just that. :-) Now I've decided to take the plunge instead.

I made a test change to the 2.5 README and merged it into 2.6 and 2.7.
Then I pushed. It *seems* to have worked, but I also got some
traceback:

hg push
pushing to ssh://hg@hg.python.org/cpython
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 6 changesets with 6 changes to 1 files
remote: change(s) NOT sent, something went wrong:
remote: [Failure instance: Traceback from remote host -- Traceback
(most recent call last):
remote:   File "/usr/lib/python2.6/dist-packages/twisted/spread/banana.py",
line 153, in gotItem
remote:     self.callExpressionReceived(item)
remote:   File "/usr/lib/python2.6/dist-packages/twisted/spread/banana.py",
line 116, in callExpressionReceived
remote:     self.expressionReceived(obj)
remote:   File "/usr/lib/python2.6/dist-packages/twisted/spread/pb.py",
line 514, in expressionReceived
remote:     method(*sexp[1:])
remote:   File "/usr/lib/python2.6/dist-packages/twisted/spread/pb.py",
line 826, in proto_message
remote:     self._recvMessage(self.localObjectForID, requestID,
objectID, message, answerRequired, netArgs, netKw)
remote: --- <exception caught here> ---
remote:   File "/usr/lib/python2.6/dist-packages/twisted/spread/pb.py",
line 840, in _recvMessage
remote:     netResult = object.remoteMessageReceived(self, message,
netArgs, netKw)
remote:   File "/usr/lib/python2.6/dist-packages/twisted/spread/pb.py",
line 225, in perspectiveMessageReceived
remote:     state = method(*args, **kw)
remote:   File "/data/buildbot/master/master.cfg", line 87, in
perspective_addChange
remote:     changedict['category'] = branch_to_category[changedict['branch']]
remote: exceptions.KeyError: '2.5'
remote: ]
remote: notified python-checkins at python.org of incoming changeset 3074c77b7121
remote: notified python-checkins at python.org of incoming changeset cf5e4bdb24a1
remote: notified python-checkins at python.org of incoming changeset 89007356798b
remote: notified python-checkins at python.org of incoming changeset cc959f114739
remote: notified python-checkins at python.org of incoming changeset 69650b81f4b9
remote: notified python-checkins at python.org of incoming changeset 5ae4f3bbaebe

I also have trouble building the 2.5 branch on OS X Snow Leopard
(10.6) with Xcode 3.2 -- this is gcc 4.2.1. I think I'll just give up
on that part though, it's probably just too old, and 2.7 builds just
fine.

> I just hope that we can stick with Mercurial for more than five years,
> before the next hot thing comes along.

+1. Just as I hope for the Python 3-4 transition, I hope that whatever
comes along next has a better transition strategy. That would make it
really hot.

-- 
--Guido van Rossum (python.org/~guido)