lp:~jelmer/ubuntu/natty/bzr/sru-2.3.4
Created by
Jelmer Vernooij
and last modified
- Get this branch:
- bzr branch lp:~jelmer/ubuntu/natty/bzr/sru-2.3.4
Only
Jelmer Vernooij
can upload to this branch. If you are
Jelmer Vernooij
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Martin Pool (community): Approve
- Ubuntu Stable Release Updates Team: Pending requested
-
Diff: 7694 lines (+3062/-823)130 files modifiedMakefile (+1/-1)
bzr (+2/-2)
bzrlib/__init__.py (+2/-2)
bzrlib/branch.py (+24/-10)
bzrlib/builtins.py (+2/-2)
bzrlib/commands.py (+7/-6)
bzrlib/config.py (+86/-5)
bzrlib/controldir.py (+4/-0)
bzrlib/crash.py (+18/-10)
bzrlib/help_topics/en/configuration.txt (+3/-1)
bzrlib/inventory.py (+69/-2)
bzrlib/lockdir.py (+12/-7)
bzrlib/merge.py (+8/-2)
bzrlib/osutils.py (+12/-0)
bzrlib/plugin.py (+12/-1)
bzrlib/plugins/launchpad/test_register.py (+6/-3)
bzrlib/tests/__init__.py (+13/-5)
bzrlib/tests/blackbox/test_bound_branches.py (+1/-1)
bzrlib/tests/blackbox/test_branch.py (+5/-5)
bzrlib/tests/blackbox/test_checkout.py (+4/-4)
bzrlib/tests/blackbox/test_clean_tree.py (+19/-19)
bzrlib/tests/blackbox/test_commit.py (+4/-0)
bzrlib/tests/blackbox/test_export.py (+18/-18)
bzrlib/tests/blackbox/test_init.py (+2/-2)
bzrlib/tests/blackbox/test_merge.py (+40/-22)
bzrlib/tests/blackbox/test_mv.py (+27/-27)
bzrlib/tests/blackbox/test_non_ascii.py (+7/-7)
bzrlib/tests/blackbox/test_push.py (+21/-5)
bzrlib/tests/blackbox/test_reconfigure.py (+1/-1)
bzrlib/tests/blackbox/test_remerge.py (+4/-4)
bzrlib/tests/blackbox/test_remove.py (+10/-10)
bzrlib/tests/blackbox/test_remove_tree.py (+32/-32)
bzrlib/tests/blackbox/test_revert.py (+9/-9)
bzrlib/tests/blackbox/test_rmbranch.py (+2/-2)
bzrlib/tests/blackbox/test_shared_repository.py (+1/-1)
bzrlib/tests/blackbox/test_shelve.py (+1/-1)
bzrlib/tests/blackbox/test_switch.py (+6/-6)
bzrlib/tests/blackbox/test_too_much.py (+10/-10)
bzrlib/tests/blackbox/test_update.py (+6/-6)
bzrlib/tests/blackbox/test_version.py (+5/-5)
bzrlib/tests/blackbox/test_versioning.py (+9/-9)
bzrlib/tests/blackbox/test_whoami.py (+4/-1)
bzrlib/tests/doc_generate/builders/test_texinfo.py (+2/-2)
bzrlib/tests/features.py (+15/-0)
bzrlib/tests/per_branch/test_bound_sftp.py (+8/-8)
bzrlib/tests/per_branch/test_branch.py (+66/-6)
bzrlib/tests/per_branch/test_create_checkout.py (+2/-2)
bzrlib/tests/per_branch/test_push.py (+53/-1)
bzrlib/tests/per_branch/test_sprout.py (+1/-1)
bzrlib/tests/per_bzrdir/test_bzrdir.py (+4/-4)
bzrlib/tests/per_controldir/test_controldir.py (+17/-17)
bzrlib/tests/per_controldir_colo/test_supported.py (+1/-1)
bzrlib/tests/per_repository/test_commit_builder.py (+5/-0)
bzrlib/tests/per_repository/test_has_same_location.py (+1/-1)
bzrlib/tests/per_repository/test_repository.py (+2/-2)
bzrlib/tests/per_transport.py (+40/-40)
bzrlib/tests/per_tree/test_get_file_mtime.py (+1/-1)
bzrlib/tests/per_workingtree/test_commit.py (+1/-1)
bzrlib/tests/per_workingtree/test_executable.py (+6/-6)
bzrlib/tests/per_workingtree/test_move.py (+3/-3)
bzrlib/tests/per_workingtree/test_pull.py (+4/-4)
bzrlib/tests/per_workingtree/test_remove.py (+28/-28)
bzrlib/tests/per_workingtree/test_rename_one.py (+4/-4)
bzrlib/tests/per_workingtree/test_workingtree.py (+13/-13)
bzrlib/tests/test_atomicfile.py (+1/-1)
bzrlib/tests/test_branch.py (+10/-10)
bzrlib/tests/test_bundle.py (+1/-1)
bzrlib/tests/test_bzrdir.py (+6/-7)
bzrlib/tests/test_cache_utf8.py (+15/-15)
bzrlib/tests/test_clean_tree.py (+3/-3)
bzrlib/tests/test_commit.py (+3/-3)
bzrlib/tests/test_config.py (+29/-6)
bzrlib/tests/test_conflicts.py (+91/-25)
bzrlib/tests/test_crash.py (+46/-3)
bzrlib/tests/test_diff.py (+1/-1)
bzrlib/tests/test_export.py (+9/-9)
bzrlib/tests/test_ftp_transport.py (+2/-2)
bzrlib/tests/test_generate_ids.py (+2/-2)
bzrlib/tests/test_globbing.py (+2/-2)
bzrlib/tests/test_ignores.py (+2/-2)
bzrlib/tests/test_inv.py (+85/-3)
bzrlib/tests/test_lazy_import.py (+2/-2)
bzrlib/tests/test_lazy_regex.py (+1/-1)
bzrlib/tests/test_lockdir.py (+5/-5)
bzrlib/tests/test_lru_cache.py (+7/-7)
bzrlib/tests/test_merge.py (+4/-4)
bzrlib/tests/test_merge_core.py (+14/-14)
bzrlib/tests/test_multiparent.py (+5/-5)
bzrlib/tests/test_osutils.py (+31/-22)
bzrlib/tests/test_plugins.py (+14/-14)
bzrlib/tests/test_registry.py (+6/-6)
bzrlib/tests/test_remote.py (+20/-0)
bzrlib/tests/test_repository.py (+1/-1)
bzrlib/tests/test_revert.py (+15/-15)
bzrlib/tests/test_revisionspec.py (+1/-1)
bzrlib/tests/test_script.py (+21/-21)
bzrlib/tests/test_selftest.py (+23/-17)
bzrlib/tests/test_sftp_transport.py (+8/-8)
bzrlib/tests/test_shelf.py (+9/-9)
bzrlib/tests/test_shelf_ui.py (+2/-2)
bzrlib/tests/test_smart_add.py (+3/-3)
bzrlib/tests/test_store.py (+6/-6)
bzrlib/tests/test_subsume.py (+2/-2)
bzrlib/tests/test_switch.py (+16/-16)
bzrlib/tests/test_transform.py (+60/-60)
bzrlib/tests/test_transport.py (+3/-3)
bzrlib/tests/test_treeshape.py (+2/-2)
bzrlib/tests/test_tuned_gzip.py (+1/-1)
bzrlib/tests/test_uncommit.py (+1/-1)
bzrlib/tests/test_upgrade.py (+17/-18)
bzrlib/tests/test_version.py (+1/-1)
bzrlib/tests/test_version_info.py (+3/-3)
bzrlib/tests/test_workingtree.py (+3/-3)
debian/changelog (+31/-0)
debian/patches/02_external_configobj (+18/-13)
debian/patches/07_lazy_import_scope (+1291/-0)
debian/patches/08_fix_auto_user_id_test (+19/-0)
debian/patches/series (+2/-0)
debian/watch (+1/-1)
doc/developers/testing.txt (+5/-0)
doc/en/release-notes/bzr-2.1.txt (+38/-1)
doc/en/release-notes/bzr-2.2.txt (+3/-0)
doc/en/release-notes/bzr-2.3.txt (+174/-0)
doc/en/user-guide/stacked.txt (+33/-24)
doc/en/whats-new/whats-new-in-2.3.txt (+7/-0)
doc/ja/index.txt (+1/-1)
doc/ja/upgrade-guide/data_migration.txt (+2/-2)
doc/ja/user-guide/stacked.txt (+1/-1)
setup.py (+9/-0)
tools/win32/py2exe_boot_common.py (+6/-1)
Related source package recipes
Branch information
- Owner:
- Jelmer Vernooij
- Status:
- Merged
Recent revisions
- 32. By Jelmer Vernooij
-
* New upstream release.
+ Fix bzr version number in deprecation warnings. LP: #794960
+ Prevent write attemps on remote branch during "bzr up". LP: #786980
+ Fix conflict handling when two trees involved in a merge have different
root ids. LP: #805809 - 28. By Matthias Klose
-
* Drop build dependency on python-subunit (universe). LP: #713038.
* Disable parallel tests. - 27. By Jelmer Vernooij
-
* New upstream release.
+ Build depend on python-configobj >= 4.7.2+ds-2 which has a fix for bug
#618349 which breaks the Bazaar testsuite.
* Switch to dh_python2.
* Switch to debhelper 7, drop cdbs. - 25. By Jelmer Vernooij
-
[ Jelmer Vernooij ]
* Cherrypick fix for compatibility with python2.7 >= 2.7.1-2. LP: #693880
* Switch to python-support. Closes: #568462
* Add missing build dependency on python-configobj.
* Make dependency on python-testtools versioned (>= 0.9.5).
* Re-remove included elementtree and configobj. Closes: #555343, #555336[ Vincent Ladeuil ]
* New upstream release.
+ Fix https python-2.7 compatibility. Closes: #608085
+ Follow the Freedesktop XDG Base Directory Specification. LP: #195397
* Drop unnecessary dependency on graphviz.[ Max Bowsher ]
* Run testsuite for bundled plugins too.[ Jelmer Vernooij ]
* Cherrypick fix around default locales. - 24. By Loïc Minier
-
* Revert back to 2.3.0~beta3-
1ubuntu1 as it's not just the readline() issue
causing problems, but bzr will corrupt .bzr dirs with python 2.7, see
LP #654731.
* Really use python2.6 by setting --executable to /usr/bin/python2.6 instead
of /usr/bin/python in debian/rules; thanks Bilal Akhtar.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
