3 files changed, 225 insertions, 148 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 2e5922b92718..dfb2ca299651 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.15
+PORTVERSION=	0.16
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/
 MASTER_SITE_SUBDIR=	gnu-arch
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 3dd6ab9806b7..0b6557ad0c2e 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.15.tar.gz) = 6512ced21dc26fba0915c50697f74e17
-SHA256 (bzr-0.15.tar.gz) = d84969833e1d588df3715e4910b891cbcc310a332796e0ce6528dd3b633c3171
-SIZE (bzr-0.15.tar.gz) = 1363733
+MD5 (bzr-0.16.tar.gz) = c72c4ae368d0ffe70cc6e3d49c299a0f
+SHA256 (bzr-0.16.tar.gz) = bc9c7e11ece9ab8f4946238d7f3e67390a5c4a2c21fe27862395810e0ea0ae85
+SIZE (bzr-0.16.tar.gz) = 1457816
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index 2b9b135d89a3..494c2f34658e 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -4,6 +4,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/breakin.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bugtracker.py
 %%PYTHON_SITELIBDIR%%/bzrlib/builtins.py
 %%PYTHON_SITELIBDIR%%/bzrlib/bzrdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/cache_utf8.py
@@ -28,6 +30,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.py
 %%PYTHON_SITELIBDIR%%/bzrlib/help.py
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics.py
+%%PYTHON_SITELIBDIR%%/bzrlib/hooks.py
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/ignores.py
 %%PYTHON_SITELIBDIR%%/bzrlib/info.py
@@ -60,26 +63,28 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/registry.py
+%%PYTHON_SITELIBDIR%%/bzrlib/remote.py
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.py
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.py
 %%PYTHON_SITELIBDIR%%/bzrlib/revisiontree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/rio.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tag.py
 %%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.py
 %%PYTHON_SITELIBDIR%%/bzrlib/sign_my_commits.py
 %%PYTHON_SITELIBDIR%%/bzrlib/status.py
+%%PYTHON_SITELIBDIR%%/bzrlib/strace.py
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tag.py
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.py
-%%PYTHON_SITELIBDIR%%/bzrlib/timestamp.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.py
+%%PYTHON_SITELIBDIR%%/bzrlib/timestamp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.py
@@ -98,30 +103,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml7.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_add.py
@@ -192,6 +173,30 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_xml.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyo
+%%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
@@ -239,6 +244,36 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/repofmt/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/repofmt/knitrepo.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/repofmt/weaverepo.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/bzrdir.py
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/client.py
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/medium.py
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/protocol.py
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/repository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/request.py
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/server.py
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/vfs.py
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/bzrdir.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/client.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/medium.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/protocol.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/repository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/request.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/server.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/vfs.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/branch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/bzrdir.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/vfs.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/client.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/medium.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/protocol.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/repository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/request.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/smart/server.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/store/text.py
 %%PYTHON_SITELIBDIR%%/bzrlib/store/revision/__init__.py
@@ -264,12 +299,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_annotate.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bugtracker.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_cache_utf8.py
@@ -282,7 +318,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_delta.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_dirstate.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_doc_generate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_errors.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_extract.py
@@ -294,9 +329,10 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_help.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_https_ca_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_https_ca_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.py
@@ -318,7 +354,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils_encodings.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.py
@@ -326,21 +361,25 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_registry.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_remote.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revert.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_smart.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_smart_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ssh_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_strace.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_subsume.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tag.py
@@ -379,13 +418,16 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bound_branches.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_branch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_breakin.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat_revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_debug.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.py
@@ -398,7 +440,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_inventory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_join.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
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.py
@@ -444,13 +485,16 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bound_branches.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_branch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_breakin.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat_revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_debug.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.pyc
@@ -463,7 +507,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_inventory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_join.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
@@ -473,7 +516,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_nick.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_ls.pyo
 %%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
@@ -510,13 +552,16 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bound_branches.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_branch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_breakin.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat_revision.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_debug.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.pyo
@@ -529,8 +574,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_inventory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_join.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_merge_directive.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyo
@@ -571,6 +616,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_hooks.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.py
@@ -579,52 +625,51 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_push.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_history.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_revno.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_uncommit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_update.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_hooks.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_push.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_history.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_uncommit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_update.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_hooks.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_push.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_history.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_uncommit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_update.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_lock.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_temporary_write_lock.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_lock.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_temporary_write_lock.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_lock.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_temporary_write_lock.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_bzrdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/__init__.pyc
@@ -649,32 +694,41 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/test_join.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/test_join.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_temporary_write_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_temporary_write_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_temporary_write_lock.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_commit_builder.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_revision.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_statistics.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_commit_builder.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_revision.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_statistics.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_commit_builder.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_revision.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_statistics.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_statistics.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_statistics.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/test_all.py
@@ -682,130 +736,135 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/test_all.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/test_all.pyo
-
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_inv.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_list_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_revision_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_walkdirs.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_inv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_list_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_revision_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_walkdirs.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_inv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_list_files.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_revision_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_walkdirs.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_flush.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.py
 %%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_move.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.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_read_working_inventory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_readonly.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.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/test_add.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_move.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_remove.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_rename_one.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_revision_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_smart_add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.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_add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_flush.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.pyc
 %%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_move.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.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_read_working_inventory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_readonly.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.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/test_add.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_move.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_remove.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_rename_one.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_revision_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_smart_add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.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_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_flush.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.pyo
 %%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_move.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.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_read_working_inventory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_readonly.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_move.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_remove.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_rename_one.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_revision_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_smart_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.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
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/diff-3
@@ -833,12 +892,13 @@ bin/bzr
 %%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_api.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_annotate.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bugtracker.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_cache_utf8.pyc
@@ -851,7 +911,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_delta.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_dirstate.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_doc_generate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_extract.pyc
@@ -862,10 +921,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_globbing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_help.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_https_ca_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_https_ca_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyc
@@ -877,18 +938,16 @@ bin/bzr
 %%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_merge_directive.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_directive.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%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_osutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils_encodings.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.pyc
@@ -896,21 +955,26 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_registry.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_remote.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revert.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.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_smart.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_smart_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ssh_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_strace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_subsume.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tag.pyc
@@ -921,9 +985,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_trace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transactions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.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_treebuilder.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyc
@@ -940,18 +1004,19 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/HttpServer.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/HttpServer.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_annotate.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bugtracker.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_cache_utf8.pyo
@@ -964,7 +1029,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_delta.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_dirstate.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_doc_generate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_extract.pyo
@@ -976,9 +1040,10 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_help.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_https_ca_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_https_ca_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyo
@@ -1000,7 +1065,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils_encodings.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.pyo
@@ -1008,22 +1072,25 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_registry.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_remote.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revert.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_ssh_transport.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ssh_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_strace.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_subsume.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tag.pyo
@@ -1035,8 +1102,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transactions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.pyo
 %%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_transport_implementations.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyo
@@ -1061,14 +1128,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/local.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/readonly.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/remote.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
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib2_wrappers.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/ca_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/response.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/wsgi.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.pyc
@@ -1076,18 +1144,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl_errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib2_wrappers.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/ca_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/response.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/wsgi.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl_errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/ca_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib2_wrappers.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/response.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/wsgi.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/ca_bundle.py
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/ca_bundle.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/ca_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/chroot.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.pyc
@@ -1097,8 +1164,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/local.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/readonly.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/remote.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/chroot.pyo
@@ -1109,8 +1176,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/local.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/readonly.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/remote.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
@@ -1120,8 +1187,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.pyc
@@ -1150,7 +1215,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/ElementTree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.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
@@ -1165,6 +1232,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/breakin.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bugtracker.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/builtins.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/bzrdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/cache_utf8.pyc
@@ -1173,21 +1242,23 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/config.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/conflicts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/debug.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/decorators.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/dirstate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/generate_ids.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/globbing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/hooks.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/ignores.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/info.pyc
@@ -1207,6 +1278,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/memorytree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/merge_directive.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/mutabletree.pyc
@@ -1219,24 +1291,28 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/registry.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/remote.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/revisiontree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/rio.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tag.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/sign_my_commits.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/status.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/strace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/timestamp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyc
@@ -1248,16 +1324,21 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/win32utils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/workingtree_4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/xml7.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
+%%PYTHON_SITELIBDIR%%/bzrlib/breakin.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bugtracker.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/builtins.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/bzrdir.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/cache_utf8.pyo
@@ -1271,6 +1352,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/decorators.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/dirstate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyo
@@ -1280,6 +1362,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/hooks.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/ignores.pyo
@@ -1300,7 +1383,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/memorytree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/merge_directive.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/rio.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/mutabletree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/option.pyo
@@ -1312,24 +1397,27 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/registry.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/remote.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revisiontree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/rio.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tag.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/sign_my_commits.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/status.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/strace.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/timestamp.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyo
@@ -1341,36 +1429,25 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/win32utils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree_4.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml7.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/dirstate.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/merge_directive.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tag.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/timestamp.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/win32utils.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/workingtree_4.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/xml7.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/dirstate.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/merge_directive.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tag.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/timestamp.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/win32utils.pyo
-
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc/api
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/export
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad
 @dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib/plugins
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/repofmt
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/smart
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/store/revision
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/store/versioned
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/store
@@ -1380,12 +1457,12 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport/http
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport