- Update to 0.13

PR:		ports/107098
Submitted by:	Ulf Lilleengen <lulf@stud.ntnu.no> (maintainer)

6 files changed, 184 insertions, 112 deletions

diff --git a/devel/bazaar-ng/Makefile b/devel/bazaar-ng/Makefile
index e359559f24aa..a06bf41c3cdf 100644
--- a/devel/bazaar-ng/Makefile
+++ b/devel/bazaar-ng/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.12
+PORTVERSION=	0.13
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/
 MASTER_SITE_SUBDIR=	gnu-arch
diff --git a/devel/bazaar-ng/distinfo b/devel/bazaar-ng/distinfo
index 9ddf3b163c89..47c0e58da2cf 100644
--- a/devel/bazaar-ng/distinfo
+++ b/devel/bazaar-ng/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.12.tar.gz) = 68bf4e425a93bdf5961af9c3c35229bf
-SHA256 (bzr-0.12.tar.gz) = cd4b860b1bbdf6577877b99f3f8ba93d4eb03235d06ee9f877ca846a1022f620
-SIZE (bzr-0.12.tar.gz) = 1088557
+MD5 (bzr-0.13.tar.gz) = 14278ee54bef1cf65ee13735b134f9dd
+SHA256 (bzr-0.13.tar.gz) = 3bb3ef28b23b36f840c8b6f69589770764fa1fd97064d26a4f3fff4066d05237
+SIZE (bzr-0.13.tar.gz) = 1126005
diff --git a/devel/bazaar-ng/pkg-plist b/devel/bazaar-ng/pkg-plist
index 039f0a3af917..1d3263235fbe 100644
--- a/devel/bazaar-ng/pkg-plist
+++ b/devel/bazaar-ng/pkg-plist
@@ -13,16 +13,19 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/config.py
 %%PYTHON_SITELIBDIR%%/bzrlib/conflicts.py
+%%PYTHON_SITELIBDIR%%/bzrlib/debug.py
 %%PYTHON_SITELIBDIR%%/bzrlib/decorators.py
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.py
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.py
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.py
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/generate_ids.py
 %%PYTHON_SITELIBDIR%%/bzrlib/gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.py
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.py
 %%PYTHON_SITELIBDIR%%/bzrlib/help.py
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics.py
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/ignores.py
 %%PYTHON_SITELIBDIR%%/bzrlib/info.py
@@ -65,13 +68,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.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/transform.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.py
@@ -80,12 +83,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/urlutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/version.py
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.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/xml4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.py
@@ -202,12 +205,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/export/dir_exporter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/export/tar_exporter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/export/zip_exporter.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.py
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_registration.py
@@ -240,13 +237,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/store/text.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/HttpServer.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.py
 %%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_ancestry.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.py
@@ -257,7 +254,6 @@ bin/bzr
 %%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_inv.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.py
@@ -266,12 +262,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ftp_transport.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_generate_ids.py
+%%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_http.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_import.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_regex.py
@@ -282,6 +281,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.py
@@ -295,13 +295,12 @@ 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_revert.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_revisiontree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.py
@@ -318,10 +317,10 @@ bin/bzr
 %%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_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.py
@@ -332,6 +331,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_wsgi.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.py
@@ -349,11 +349,12 @@ bin/bzr
 %%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_diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.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_ignore.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.py
@@ -366,14 +367,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_nick.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_non_ascii.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_ls.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove_tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.py
@@ -406,11 +410,12 @@ bin/bzr
 %%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_diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.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_ignore.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyc
@@ -419,19 +424,20 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_locale.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_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
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove_tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.pyc
@@ -461,14 +467,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_debug.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
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.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_ignore.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyo
@@ -480,6 +487,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_nick.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_non_ascii.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_outside_wt.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.pyo
@@ -488,6 +496,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.pyo
@@ -674,13 +683,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/patchtext.patch
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/HttpServer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyc
@@ -691,7 +700,6 @@ bin/bzr
 %%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_inv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyc
@@ -700,12 +708,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ftp_transport.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_generate_ids.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.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_http_response.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_import.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_regex.pyc
@@ -716,6 +727,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyc
@@ -729,54 +741,54 @@ 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_revert.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revert.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.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_smart_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.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_trace.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_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_wsgi.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyo
+%%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_ancestry.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyo
@@ -787,7 +799,6 @@ bin/bzr
 %%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_inv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyo
@@ -796,12 +807,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ftp_transport.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_generate_ids.pyo
+%%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_http.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_import.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_regex.pyo
@@ -812,7 +826,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyo
@@ -825,14 +841,13 @@ 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_revert.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_revisiontree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyo
@@ -848,12 +863,11 @@ 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_tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version.pyo
@@ -862,9 +876,11 @@ bin/bzr
 %%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_wsgi.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/chroot.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakenfs.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakevfat.py
@@ -879,18 +895,25 @@ bin/bzr
 %%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/response.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/wsgi.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.pyc
 %%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/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/_urllib2_wrappers.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/response.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/wsgi.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/chroot.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakenfs.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakevfat.pyc
@@ -902,6 +925,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/smart.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/ssh.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/chroot.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakenfs.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakevfat.pyo
@@ -912,6 +936,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/smart.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/ssh.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.py
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.py
@@ -965,16 +995,19 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/config.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/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/generate_ids.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.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/identitymap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/ignores.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/info.pyc
@@ -984,15 +1017,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/knit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/lock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lazy_import.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lazy_regex.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/memorytree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyc
@@ -1017,32 +1050,32 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/urlutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/version.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/branch.pyo
@@ -1051,29 +1084,32 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/cache_utf8.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/check.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/cmd_version_info.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/commands.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/config.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/conflicts.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/debug.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/decorators.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/generate_ids.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/ignores.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inspect_for_copy.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/knit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/knit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lazy_import.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lazy_regex.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lock.pyo
@@ -1107,13 +1143,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyo
@@ -1122,21 +1158,21 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/urlutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/version.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.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/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc/api
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc
 @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
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index e359559f24aa..a06bf41c3cdf 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.12
+PORTVERSION=	0.13
 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 9ddf3b163c89..47c0e58da2cf 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.12.tar.gz) = 68bf4e425a93bdf5961af9c3c35229bf
-SHA256 (bzr-0.12.tar.gz) = cd4b860b1bbdf6577877b99f3f8ba93d4eb03235d06ee9f877ca846a1022f620
-SIZE (bzr-0.12.tar.gz) = 1088557
+MD5 (bzr-0.13.tar.gz) = 14278ee54bef1cf65ee13735b134f9dd
+SHA256 (bzr-0.13.tar.gz) = 3bb3ef28b23b36f840c8b6f69589770764fa1fd97064d26a4f3fff4066d05237
+SIZE (bzr-0.13.tar.gz) = 1126005
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index 039f0a3af917..1d3263235fbe 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -13,16 +13,19 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/config.py
 %%PYTHON_SITELIBDIR%%/bzrlib/conflicts.py
+%%PYTHON_SITELIBDIR%%/bzrlib/debug.py
 %%PYTHON_SITELIBDIR%%/bzrlib/decorators.py
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.py
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.py
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.py
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/generate_ids.py
 %%PYTHON_SITELIBDIR%%/bzrlib/gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.py
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.py
 %%PYTHON_SITELIBDIR%%/bzrlib/help.py
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics.py
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/ignores.py
 %%PYTHON_SITELIBDIR%%/bzrlib/info.py
@@ -65,13 +68,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.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/transform.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.py
@@ -80,12 +83,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/urlutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/version.py
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.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/xml4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.py
@@ -202,12 +205,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/export/dir_exporter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/export/tar_exporter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/export/zip_exporter.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.py
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_registration.py
@@ -240,13 +237,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/store/text.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/HttpServer.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.py
 %%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_ancestry.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.py
@@ -257,7 +254,6 @@ bin/bzr
 %%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_inv.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.py
@@ -266,12 +262,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ftp_transport.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_generate_ids.py
+%%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_http.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_import.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_regex.py
@@ -282,6 +281,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.py
@@ -295,13 +295,12 @@ 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_revert.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_revisiontree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.py
@@ -318,10 +317,10 @@ bin/bzr
 %%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_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.py
@@ -332,6 +331,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_wsgi.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.py
@@ -349,11 +349,12 @@ bin/bzr
 %%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_diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.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_ignore.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.py
@@ -366,14 +367,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_nick.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_non_ascii.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_ls.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove_tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.py
@@ -406,11 +410,12 @@ bin/bzr
 %%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_diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.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_ignore.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyc
@@ -419,19 +424,20 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_locale.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_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
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove_tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.pyc
@@ -461,14 +467,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_debug.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
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.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_ignore.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyo
@@ -480,6 +487,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_nick.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_non_ascii.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_outside_wt.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.pyo
@@ -488,6 +496,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.pyo
@@ -674,13 +683,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/patchtext.patch
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/HttpServer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyc
@@ -691,7 +700,6 @@ bin/bzr
 %%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_inv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyc
@@ -700,12 +708,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ftp_transport.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_generate_ids.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.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_http_response.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_import.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_regex.pyc
@@ -716,6 +727,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyc
@@ -729,54 +741,54 @@ 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_revert.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revert.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.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_smart_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.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_trace.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_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_wsgi.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyo
+%%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_ancestry.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyo
@@ -787,7 +799,6 @@ bin/bzr
 %%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_inv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyo
@@ -796,12 +807,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ftp_transport.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_generate_ids.pyo
+%%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_http.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_import.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lazy_regex.pyo
@@ -812,7 +826,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyo
@@ -825,14 +841,13 @@ 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_revert.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_revisiontree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyo
@@ -848,12 +863,11 @@ 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_tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_version.pyo
@@ -862,9 +876,11 @@ bin/bzr
 %%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_wsgi.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/chroot.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakenfs.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakevfat.py
@@ -879,18 +895,25 @@ bin/bzr
 %%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/response.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/wsgi.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.pyc
 %%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/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/_urllib2_wrappers.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/response.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/wsgi.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/chroot.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakenfs.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakevfat.pyc
@@ -902,6 +925,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/smart.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/ssh.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/chroot.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakenfs.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakevfat.pyo
@@ -912,6 +936,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/smart.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/ssh.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.py
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.py
@@ -965,16 +995,19 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/config.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/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/generate_ids.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.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/identitymap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/ignores.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/info.pyc
@@ -984,15 +1017,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/knit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/lock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lazy_import.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lazy_regex.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/memorytree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyc
@@ -1017,32 +1050,32 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/urlutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/version.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/branch.pyo
@@ -1051,29 +1084,32 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/cache_utf8.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/check.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/cmd_version_info.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/commands.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/config.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/conflicts.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/debug.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/decorators.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/generate_ids.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/ignores.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inspect_for_copy.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/knit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/knit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lazy_import.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lazy_regex.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lock.pyo
@@ -1107,13 +1143,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/treebuilder.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyo
@@ -1122,21 +1158,21 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/urlutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/version.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.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/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc/api
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc
 @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
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins