3 files changed, 120 insertions, 38 deletions

diff --git a/devel/bazaar-ng/Makefile b/devel/bazaar-ng/Makefile
index b695e5048ff7..9717cd078347 100644
--- a/devel/bazaar-ng/Makefile
+++ b/devel/bazaar-ng/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.10
+PORTVERSION=	0.11
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/
 MASTER_SITE_SUBDIR=	gnu-arch
diff --git a/devel/bazaar-ng/distinfo b/devel/bazaar-ng/distinfo
index 5a67af3c84b5..aaabd6acc981 100644
--- a/devel/bazaar-ng/distinfo
+++ b/devel/bazaar-ng/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.10.tar.gz) = 8a21693efe9b06bed04fa4e8a74b7e83
-SHA256 (bzr-0.10.tar.gz) = 4a9b5b2d0b2c33c91dabeb0831b3da660189eb38ad9c28c929ea64b79fecc20f
-SIZE (bzr-0.10.tar.gz) = 950911
+MD5 (bzr-0.11.tar.gz) = 94fced266d6da6ed298e4738ca7414e0
+SHA256 (bzr-0.11.tar.gz) = f2e30edef95caeb91db9c568fc8f1a7cff628e7417c4f6d025908499970bbc17
+SIZE (bzr-0.11.tar.gz) = 1040731
diff --git a/devel/bazaar-ng/pkg-plist b/devel/bazaar-ng/pkg-plist
index ecb1567bb9b3..9837f2c093e6 100644
--- a/devel/bazaar-ng/pkg-plist
+++ b/devel/bazaar-ng/pkg-plist
@@ -8,6 +8,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/bzrdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/cache_utf8.py
 %%PYTHON_SITELIBDIR%%/bzrlib/check.py
+%%PYTHON_SITELIBDIR%%/bzrlib/cmd_version_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/commands.py
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/config.py
@@ -22,23 +23,27 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.py
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.py
 %%PYTHON_SITELIBDIR%%/bzrlib/help.py
-%%PYTHON_SITELIBDIR%%/bzrlib/info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/ignores.py
+%%PYTHON_SITELIBDIR%%/bzrlib/info.py
+%%PYTHON_SITELIBDIR%%/bzrlib/inspect_for_copy.py
 %%PYTHON_SITELIBDIR%%/bzrlib/inter.py
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.py
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/knit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/lazy_import.py
 %%PYTHON_SITELIBDIR%%/bzrlib/lock.py
 %%PYTHON_SITELIBDIR%%/bzrlib/lockable_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/lockdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/lsprof.py
+%%PYTHON_SITELIBDIR%%/bzrlib/memorytree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.py
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.py
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.py
+%%PYTHON_SITELIBDIR%%/bzrlib/mutabletree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/option.py
 %%PYTHON_SITELIBDIR%%/bzrlib/osutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.py
@@ -47,14 +52,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.py
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.py
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/branch.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/transport.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.py
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.py
@@ -71,8 +68,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.py
-%%PYTHON_SITELIBDIR%%/bzrlib/transform.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transform.py
+%%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.py
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.py
@@ -87,6 +85,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.py
+%%PYTHON_SITELIBDIR%%/bzrlib/xml6.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_add.py
@@ -166,6 +165,14 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/branch.txt
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/transport.txt
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/export/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/export/dir_exporter.py
 %%PYTHON_SITELIBDIR%%/bzrlib/export/tar_exporter.py
@@ -243,9 +250,11 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_import.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockable_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_memorytree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.py
@@ -253,6 +262,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.py
@@ -262,18 +272,19 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revert.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.py
@@ -285,11 +296,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.py
@@ -320,6 +333,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_locale.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.py
@@ -335,11 +350,11 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_selftest.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_serve.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_shared_repository.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_sign_my_commits.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.py
@@ -348,6 +363,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_uncommit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_update.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_version_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.pyc
@@ -372,19 +388,23 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_locale.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_non_ascii.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_outside_wt.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_push.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_re_sign.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.pyc
@@ -392,6 +412,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_selftest.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_serve.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_shared_repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_sign_my_commits.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyc
@@ -400,6 +421,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_uncommit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_update.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_version_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.pyo
@@ -426,9 +448,10 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_locale.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyo
@@ -445,6 +468,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_selftest.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_serve.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_shared_repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_sign_my_commits.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyo
@@ -453,8 +477,10 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_uncommit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_update.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_version_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.py
@@ -552,7 +578,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_merge_from_branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_mkdir.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyc
@@ -564,7 +595,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_merge_from_branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_mkdir.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyo
@@ -576,7 +612,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_merge_from_branch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_mkdir.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/diff
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/diff-2
@@ -600,12 +641,11 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/patchtext.patch
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyc
@@ -629,13 +669,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_import.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockable_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_memorytree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyc
@@ -643,6 +685,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.pyc
@@ -652,18 +695,19 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revert.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyc
@@ -673,18 +717,20 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transactions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyo
@@ -721,9 +767,11 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_import.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockable_files.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockdir.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_memorytree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyo
@@ -731,6 +779,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.pyo
@@ -740,18 +789,19 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revert.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyo
@@ -763,11 +813,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyo
@@ -783,6 +835,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/readonly.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/smart.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/ssh.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl_errors.py
@@ -807,6 +861,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/readonly.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/smart.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/ssh.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakenfs.pyo
@@ -816,6 +872,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/readonly.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/smart.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/ssh.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/ui/text.py
 %%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyc
@@ -852,6 +910,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/format_python.py
+%%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/format_rio.py
+%%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/format_python.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/format_rio.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/format_python.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats/format_rio.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyc
@@ -861,6 +928,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/bzrdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/cache_utf8.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/check.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/cmd_version_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/config.pyc
@@ -875,23 +943,27 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/ignores.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/info.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/inspect_for_copy.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/inter.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/knit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/knit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/lazy_import.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lockable_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lockdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lsprof.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/memorytree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/mutabletree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/option.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/osutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.pyc
@@ -910,14 +982,16 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/transform.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transform.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.pyc
@@ -926,15 +1000,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/version.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/xml6.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/branch.pyo
@@ -942,6 +1016,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/bzrdir.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/cache_utf8.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/check.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/cmd_version_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/commands.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/config.pyo
@@ -956,23 +1031,27 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/ignores.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/info.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/inspect_for_copy.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/knit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/lazy_import.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lock.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lockable_files.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lockdir.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/log.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lsprof.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/memorytree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/mutabletree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/option.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/osutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.pyo
@@ -997,8 +1076,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/transform.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transform.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.pyo
@@ -1013,6 +1093,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/xml6.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc/api
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc
@@ -1046,4 +1127,5 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib