3 files changed, 342 insertions, 69 deletions

diff --git a/devel/bazaar-ng/Makefile b/devel/bazaar-ng/Makefile
index dcf235a92936..1d53172d5b77 100644
--- a/devel/bazaar-ng/Makefile
+++ b/devel/bazaar-ng/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.7
+PORTVERSION=	0.8
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/pkg/ \
 		http://voodoo.bawue.com/download/
@@ -23,9 +23,6 @@ USE_PYDISTUTILS=	yes
 
 MAN1=		bzr.1
 
-post-build:
-	cd ${WRKSRC} && ${PYTHON_CMD} bzr_man.py
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/bzr.1 ${MAN1PREFIX}/man/man1
 
diff --git a/devel/bazaar-ng/distinfo b/devel/bazaar-ng/distinfo
index e65cb59c3cef..56051f6aa575 100644
--- a/devel/bazaar-ng/distinfo
+++ b/devel/bazaar-ng/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.7.tar.gz) = 5daf99b67478027ed0914edf32997181
-SHA256 (bzr-0.7.tar.gz) = a9abf88785f0d2c397de9cf4ef02cb63462b1458f583d3ce48cd6f7c21e7a36b
-SIZE (bzr-0.7.tar.gz) = 569679
+MD5 (bzr-0.8.tar.gz) = 88ccc545c202701544c4e039d373a48a
+SHA256 (bzr-0.8.tar.gz) = 018617c70ff979e25c89a6aa70a3751253d498e3666e775b464e3ccdc6c8b709
+SIZE (bzr-0.8.tar.gz) = 711210
diff --git a/devel/bazaar-ng/pkg-plist b/devel/bazaar-ng/pkg-plist
index fd0e3236f499..8aa65a73bbbd 100644
--- a/devel/bazaar-ng/pkg-plist
+++ b/devel/bazaar-ng/pkg-plist
@@ -5,13 +5,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/branch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/builtins.py
-%%PYTHON_SITELIBDIR%%/bzrlib/changeset.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bzrdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/check.py
-%%PYTHON_SITELIBDIR%%/bzrlib/clone.py
 %%PYTHON_SITELIBDIR%%/bzrlib/commands.py
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/config.py
 %%PYTHON_SITELIBDIR%%/bzrlib/conflicts.py
+%%PYTHON_SITELIBDIR%%/bzrlib/decorators.py
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.py
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.py
@@ -23,14 +23,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/help.py
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/info.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/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/merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.py
-%%PYTHON_SITELIBDIR%%/bzrlib/merge_core.py
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.py
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.py
 %%PYTHON_SITELIBDIR%%/bzrlib/option.py
@@ -38,28 +42,43 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.py
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.py
+%%PYTHON_SITELIBDIR%%/bzrlib/reconcile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/repository.py
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.py
 %%PYTHON_SITELIBDIR%%/bzrlib/rio.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.py
+%%PYTHON_SITELIBDIR%%/bzrlib/sign_my_commits.py
 %%PYTHON_SITELIBDIR%%/bzrlib/status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.py
+%%PYTHON_SITELIBDIR%%/bzrlib/textfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/textmerge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transform.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.py
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/upgrade.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.py
+%%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.py
-%%PYTHON_SITELIBDIR%%/bzrlib/workingtree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/xml.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml4.py
+%%PYTHON_SITELIBDIR%%/bzrlib/workingtree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.py
+%%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.py
+%%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
@@ -77,37 +96,52 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/store/text.py
-%%PYTHON_SITELIBDIR%%/bzrlib/store/weave.py
+%%PYTHON_SITELIBDIR%%/bzrlib/store/revision/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/store/revision/knit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/store/revision/text.py
+%%PYTHON_SITELIBDIR%%/bzrlib/store/revision/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/store/revision/knit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/store/revision/text.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/store/revision/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/store/revision/knit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/store/revision/text.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/store/versioned/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/store/versioned/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/store/versioned/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/store/text.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/store/weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/store/text.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/store/weave.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.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_bad_files.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_basis_inventory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit_merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.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_fetch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.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_merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.py
@@ -116,32 +150,37 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_parent.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_remove.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_progress.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revprops.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reweave.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_add.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textfile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textmerge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_trace.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transactions.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_uncommit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.py
@@ -149,64 +188,229 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_added.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_aliases.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ancestry.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_annotate.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bound_branches.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_break_lock.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_outside_wt.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_push.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_re_sign.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.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_shared_repository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_sign_my_commits.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_too_much.py
+%%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_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_added.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_aliases.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ancestry.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_annotate.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bound_branches.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_break_lock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_outside_wt.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.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_revert.pyc
 %%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_shared_repository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_sign_my_commits.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_too_much.pyc
+%%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_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_added.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_aliases.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ancestry.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_annotate.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bound_branches.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_break_lock.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_outside_wt.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_push.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_re_sign.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.pyo
 %%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_shared_repository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_sign_my_commits.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_too_much.pyo
+%%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_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.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
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.py
+%%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_update.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_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_update.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_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_update.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
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/test_join.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/__init__.pyc
+%%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/repository_implementations/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.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/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.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/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/test_all.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/__init__.pyc
+%%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/workingtree_implementations/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.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
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.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
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.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_bad_files.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_basis_inventory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit_merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.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_fetch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyc
 %%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_identitymap.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.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_merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyc
@@ -215,32 +419,37 @@ bin/bzr
 %%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_parent.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_remove.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_progress.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revprops.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reweave.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_add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textfile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textmerge.pyc
 %%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_transport.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_uncommit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.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_workingtree.pyc
@@ -251,25 +460,31 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.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_bad_files.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_basis_inventory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.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_fetch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.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_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyo
@@ -278,54 +493,77 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_parent.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_remove.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_progress.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revprops.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reweave.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_smart_add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textfile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textmerge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_trace.pyo
 %%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_tsort.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_uncommit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/fakenfs.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/fakevfat.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/ftp.py
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/http.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/local.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/readonly.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/fakenfs.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/fakevfat.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/ftp.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/http.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/local.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/readonly.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/fakenfs.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/fakevfat.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/ftp.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/http.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/local.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/readonly.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/ui/text.py
@@ -369,74 +607,87 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/branch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/builtins.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/changeset.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bzrdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/check.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/clone.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/config.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/conflicts.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/decorators.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/info.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/inter.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/knit.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/merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/merge_core.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/option.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/osutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/reconcile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/rio.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/sign_my_commits.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyc
+%%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/tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transform.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.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/xml.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.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/builtins.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/changeset.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bzrdir.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/check.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/clone.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/commands.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/config.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/conflicts.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/decorators.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.pyo
@@ -448,14 +699,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/info.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/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/merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/merge_core.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/option.pyo
@@ -463,33 +718,54 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/reconcile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/rio.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.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/testament.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transform.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/xml.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc/api
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/export
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/store/revision
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/store/versioned
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/store
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport/http
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/ui
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree
@@ -497,4 +773,4 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/