Created by Jelmer Vernooij on 2011-09-27 and last modified on 2011-09-27
Get this branch:
bzr branch lp:~jelmer/ubuntu/maverick/bzr/2.2.5
Only Jelmer Vernooij can upload to this branch. If you are Jelmer Vernooij please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Jelmer Vernooij

Recent revisions

23. By Jelmer Vernooij on 2011-09-27

releasing version 2.2.5-0ubuntu1

22. By Jelmer Vernooij on 2011-09-27

* New upstream release.
 + Fixes merge failing with NoFinalPath. LP: #805809
 + Warns users when brancing from UDD branches that are out of date.
   LP: #609187
 + stacking is now fully transitive. LP: #715000

21. By Jelmer Vernooij on 2011-09-27

Update watch file.

20. By Martin Pool on 2011-04-07

[ Jelmer Vernooij ]
* Update watch file to use 2.2 series.
* New upstream release.
 + Fixes closing of leaked sockets to SSH subprocesses, which causes
   dput sftp uploads to hang. LP: #659590
 + Fixes the use of 'lp:' urls behind a http proxy. LP: #558343
 + Correctly sets the Content-Type header when http POSTing to comply
   with stricter web frameworks. LP: #665100
 + Fixes propagating tags to the master branch in a bound branch or
   heavyweight checkout. LP: #603395
 + Fixes the use of 'bzr resolve --take-other' if the file is
   involved in an unresolved text conflict. LP: #646961
 + Fixes https access with newer versions of python2.7. LP: #693880
 + Fixes crash during pack caused by a concurrent repository pack
   operation. LP: #701940
 + Fixes communication with the Launchpad web service when using
   launchpadlib >= 1.5.5. LP: #707075
 + Switches away from deprecated 'edge.launchpad.net' LP: #583667
 + Fixes resolving of content (and path) conflicts for files in subdirs.
   LP: #660935
 + Fixes nasty recursion loop while displaying branch opening error.
   LP: #687653

[ Martin Pool ]
* Propose for maverick SRU.

19. By Max Bowsher on 2010-09-30

* New upstream release.
 + Fix regression with upgrading poor-root to rich-root formats. LP: #636930
 + Files in ~/.bazaar are now locked whilst being updated automatically.
   LP: #525571

18. By Jelmer Vernooij on 2010-08-07

* New upstream release.
 + Adds support for setting timestamps to originating revisions.
   Closes: #473450
 + Removes remaining string exception. Closes: #585193, LP: #586926
 + Add C extension to work around Python issue 1628205. LP: #583941,
   Closes: #577110
 + Avoids showing progress bars when --quiet is used. Closes: #542105,
   LP: #320035
 + No longer creates ~/.bazaar as root when run under sudo. LP: #376388
 + 'bzr commit' now supports -p as alternative for --show-diff. LP: #571467
 + 'bzr add' no longer adds .THIS/.BASE/.THEIRS files unless
   explicitly requested. LP: #322767
 + When parsing patch files, Bazaar now supports diff lines before each
   patch. LP: #502076
 + WorkingTrees now no longer requires using signal.signal, so can
   be used in a threaded environment. LP: #521989
 + An assertion error is no longer triggered when pushing to a pre-1.6
   Bazaar server. LP: #528041
* Bump standards version to 3.9.1.

17. By Maximiliano Curia on 2010-07-30

* Non-maintainer upload.
* Fix access via http_proxy. Closes: #588430

16. By Jelmer Vernooij on 2010-05-27

New upstream release.

15. By Steve Langasek on 2010-05-17

* Non-maintainer upload with Jelmer's permission.
* Backport fix from bzr 2.2 that makes bzr-git and bzr-svn operations
  work reliably again. Closes: #582033

14. By Jelmer Vernooij on 2010-03-24

* Remove bob2 from uploaders. Closes: #573427
* New upstream release.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.