Viewing all changes in revision 5241.2.1.
- Committer: Robert Collins
- Date: 2010-05-20 02:57:52 UTC
- mfrom: (4797.43.11 2.1)
- mto: This revision was merged to the branch mainline in revision 5243.
- Revision ID: robertc@robertcollins.net-20100520025752-dbfi4kx7y4ivtiff
Merge up from 2.0/2.1:
* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
(John Arbash Meinel, #582656)
* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
support of bzr-externals and scmproj plugins.
(Alexander Belchenko, bug #572098)
* Reduce peak memory by one copy of compressed text.
(John Arbash Meinel, #566940)
* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
(John Arbash Meinel, #582656)
* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
(John Arbash Meinel, #582656)
* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
support of bzr-externals and scmproj plugins.
(Alexander Belchenko, bug #572098)
* Reduce peak memory by one copy of compressed text.
(John Arbash Meinel, #566940)
* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
(John Arbash Meinel, #582656)
expand all
collapse all
added
removed
