Merge lp://staging/~jelmer/ubuntu/maverick/bzr/2.2.5 into lp://staging/ubuntu/maverick/bzr
Proposed by
Jelmer Vernooij
| Status: | Superseded | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~jelmer/ubuntu/maverick/bzr/2.2.5 | ||||||||||||
| Merge into: | lp://staging/ubuntu/maverick/bzr | ||||||||||||
| Diff against target: |
22226 lines (+6010/-3281) 170 files modified
.pc/applied-patches (+1/-1) .pc/debian-changes-2.2.0-1/bzrlib/rules.py (+0/-155) .pc/debian-changes-2.2.0-1/bzrlib/xml_serializer.py (+0/-195) .pc/debian-changes-2.2.1-0ubuntu1/bzrlib/rules.py (+155/-0) .pc/debian-changes-2.2.1-0ubuntu1/bzrlib/xml_serializer.py (+197/-0) Makefile (+1/-1) NEWS (+724/-232) bzr (+12/-13) bzrlib/__init__.py (+3/-3) bzrlib/_annotator_pyx.c (+108/-108) bzrlib/_bencode_pyx.c (+128/-128) bzrlib/_btree_serializer_pyx.c (+150/-150) bzrlib/_chk_map_pyx.c (+212/-212) bzrlib/_chunks_to_lines_pyx.c (+36/-36) bzrlib/_dirstate_helpers_pyx.c (+602/-602) bzrlib/_groupcompress_pyx.c (+186/-186) bzrlib/_knit_load_data_pyx.c (+90/-90) bzrlib/_known_graph_pyx.c (+349/-349) bzrlib/_patiencediff_c.c (+2/-2) bzrlib/_readdir_pyx.c (+76/-76) bzrlib/_rio_pyx.c (+77/-77) bzrlib/_simple_set_pyx.c (+146/-146) bzrlib/branch.py (+2/-7) bzrlib/commands.py (+1/-0) bzrlib/commit.py (+12/-1) bzrlib/conflicts.py (+6/-7) bzrlib/dirstate.py (+11/-5) bzrlib/doc_generate/autodoc_man.py (+2/-2) bzrlib/errors.py (+24/-0) bzrlib/fetch.py (+5/-4) bzrlib/generate_ids.py (+4/-4) bzrlib/groupcompress.py (+2/-2) bzrlib/help_topics/__init__.py (+1/-1) bzrlib/help_topics/en/configuration.txt (+3/-1) bzrlib/inventory.py (+0/-3) bzrlib/knit.py (+1/-1) bzrlib/lockdir.py (+44/-2) bzrlib/merge.py (+8/-2) bzrlib/mutabletree.py (+18/-0) bzrlib/plugins/launchpad/__init__.py (+64/-4) bzrlib/plugins/launchpad/lp_api.py (+19/-6) bzrlib/plugins/launchpad/lp_api_lite.py (+285/-0) bzrlib/plugins/launchpad/lp_propose.py (+1/-1) bzrlib/plugins/launchpad/lp_registration.py (+2/-2) bzrlib/plugins/launchpad/test_lp_api_lite.py (+557/-0) bzrlib/plugins/launchpad/test_lp_service.py (+0/-12) bzrlib/plugins/launchpad/test_register.py (+2/-2) bzrlib/repofmt/groupcompress_repo.py (+13/-4) bzrlib/repofmt/pack_repo.py (+38/-4) bzrlib/repository.py (+1/-2) bzrlib/revisiontree.py (+1/-1) bzrlib/tests/__init__.py (+13/-1) bzrlib/tests/blackbox/test_add.py (+9/-0) bzrlib/tests/blackbox/test_alias.py (+4/-2) bzrlib/tests/blackbox/test_commit.py (+2/-0) bzrlib/tests/blackbox/test_conflicts.py (+45/-0) bzrlib/tests/blackbox/test_export.py (+5/-8) bzrlib/tests/blackbox/test_tags.py (+56/-9) bzrlib/tests/features.py (+15/-0) bzrlib/tests/per_interrepository/__init__.py (+14/-3) bzrlib/tests/per_lock/test_lock.py (+2/-1) bzrlib/tests/per_repository/test_commit_builder.py (+24/-0) bzrlib/tests/per_repository_reference/__init__.py (+1/-0) bzrlib/tests/per_repository_reference/test_graph.py (+45/-0) bzrlib/tests/per_tree/__init__.py (+1/-0) bzrlib/tests/per_tree/test_is_executable.py (+37/-0) bzrlib/tests/per_workingtree/test_symlinks.py (+79/-2) bzrlib/tests/test_branch.py (+9/-0) bzrlib/tests/test_bzrdir.py (+10/-0) bzrlib/tests/test_commands.py (+1/-0) bzrlib/tests/test_config.py (+27/-1) bzrlib/tests/test_conflicts.py (+153/-1) bzrlib/tests/test_dirstate.py (+16/-0) bzrlib/tests/test_errors.py (+16/-0) bzrlib/tests/test_http.py (+2/-0) bzrlib/tests/test_knit.py (+27/-0) bzrlib/tests/test_lockdir.py (+103/-1) bzrlib/tests/test_osutils.py (+10/-3) bzrlib/tests/test_repository.py (+101/-1) bzrlib/tests/test_rio.py (+8/-0) bzrlib/tests/test_selftest.py (+42/-6) bzrlib/tests/test_setup.py (+5/-5) bzrlib/tests/test_transform.py (+5/-3) bzrlib/tests/test_workingtree.py (+7/-7) bzrlib/transform.py (+8/-3) bzrlib/transport/ftp/__init__.py (+11/-1) bzrlib/transport/http/_pycurl.py (+8/-6) bzrlib/transport/http/_urllib.py (+4/-2) bzrlib/transport/http/_urllib2_wrappers.py (+13/-9) bzrlib/transport/ssh.py (+25/-8) bzrlib/util/configobj/configobj.py (+4/-2) bzrlib/versionedfile.py (+13/-0) bzrlib/workingtree.py (+7/-2) bzrlib/workingtree_4.py (+1/-1) bzrlib/xml_serializer.py (+2/-0) debian/changelog (+49/-0) debian/patches/debian-changes-2.2.0-1 (+0/-86) debian/patches/debian-changes-2.2.1-0ubuntu1 (+60/-0) debian/patches/series (+1/-1) debian/watch (+2/-2) doc/developers/HACKING.txt (+4/-4) doc/developers/bug-handling.txt (+13/-11) doc/developers/case-insensitive-file-systems.txt (+1/-1) doc/developers/content-filtering.txt (+3/-3) doc/developers/contribution-quickstart.txt (+1/-1) doc/developers/development-repo.txt (+1/-1) doc/developers/ec2.txt (+3/-3) doc/developers/index-plain.txt (+2/-2) doc/developers/packrepo.txt (+1/-1) doc/developers/planned-performance-changes.txt (+0/-7) doc/developers/releasing.txt (+19/-15) doc/en/_templates/index.html (+1/-1) doc/en/admin-guide/code-browsing.txt (+2/-2) doc/en/admin-guide/hooks-plugins.txt (+4/-4) doc/en/admin-guide/migration.txt (+2/-2) doc/en/admin-guide/simple-setups.txt (+1/-1) doc/en/admin-guide/upgrade.txt (+2/-2) doc/en/mini-tutorial/index.txt (+6/-6) doc/en/tutorials/centralized_workflow.txt (+3/-3) doc/en/tutorials/tutorial.txt (+3/-3) doc/en/tutorials/using_bazaar_with_launchpad.txt (+1/-1) doc/en/upgrade-guide/overview.txt (+1/-1) doc/en/user-guide/branching_a_project.txt (+1/-1) doc/en/user-guide/bzrtools_plugin.txt (+1/-1) doc/en/user-guide/configuring_bazaar.txt (+2/-2) doc/en/user-guide/hooks.txt (+1/-1) doc/en/user-guide/installing_bazaar.txt (+4/-4) doc/en/user-guide/introducing_bazaar.txt (+3/-3) doc/en/user-guide/plugins.txt (+3/-3) doc/en/user-guide/sending_changes.txt (+1/-1) doc/en/user-guide/server.txt (+1/-1) doc/en/user-guide/setting_up_email.txt (+1/-1) doc/en/user-guide/shared_repository_layouts.txt (+1/-1) doc/en/user-guide/specifying_revisions.txt (+1/-1) doc/en/user-guide/svn_plugin.txt (+2/-2) doc/en/user-guide/version_info.txt (+1/-1) doc/en/user-guide/web_browsing.txt (+1/-1) doc/en/user-guide/writing_a_plugin.txt (+2/-2) doc/en/user-reference/readme.txt (+1/-1) doc/en/whats-new/whats-new-in-2.1.txt (+10/-0) doc/en/whats-new/whats-new-in-2.2.txt (+288/-44) doc/es/index.txt (+6/-6) doc/es/mini-tutorial/index.txt (+6/-6) doc/index.es.txt (+7/-7) doc/index.ja.txt (+5/-5) doc/index.ru.txt (+5/-5) doc/index.txt (+5/-5) doc/ja/index.txt (+6/-6) doc/ja/mini-tutorial/index.txt (+6/-6) doc/ja/tutorials/centralized_workflow.txt (+3/-3) doc/ja/tutorials/tutorial.txt (+3/-3) doc/ja/tutorials/using_bazaar_with_launchpad.txt (+1/-1) doc/ja/upgrade-guide/overview.txt (+1/-1) doc/ja/user-guide/bzrtools_plugin.txt (+1/-1) doc/ja/user-guide/installing_bazaar.txt (+5/-5) doc/ja/user-guide/introducing_bazaar.txt (+3/-3) doc/ja/user-guide/plugins.txt (+1/-1) doc/ja/user-guide/server.txt (+1/-1) doc/ja/user-guide/shared_repository_layouts.txt (+1/-1) doc/ja/user-guide/svn_plugin.txt (+2/-2) doc/ja/user-guide/web_browsing.txt (+1/-1) doc/ja/user-reference/index.txt (+19/-22) doc/ru/index.txt (+3/-3) doc/ru/mini-tutorial/index.txt (+6/-6) doc/ru/tutorials/centralized_workflow.txt (+3/-3) doc/ru/tutorials/tutorial.txt (+3/-3) doc/ru/tutorials/using_bazaar_with_launchpad.txt (+1/-1) doc/ru/user-guide/introducing_bazaar.txt (+3/-3) setup.py (+18/-5) tools/check-newsbugs.py (+2/-1) |
||||||||||||
| To merge this branch: | bzr merge lp://staging/~jelmer/ubuntu/maverick/bzr/2.2.5 | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Stable Release Updates Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2011-09-27.
Description of the change
bzr microrelease 2.2.5
This fixes a couple of bugs that might be affecting users:
* stacking is not fully transitive (715000)
* merge failing with NoFinalPath (#805809)
To post a comment you must log in.
Unmerged revisions
- 23. By Jelmer Vernooij
-
releasing version 2.2.5-0ubuntu1
- 22. By Jelmer Vernooij
-
* 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
-
Update watch file.
- 20. By Martin Pool
-
[ 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
-
* 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
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
