3 files changed, 81 insertions, 60 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index a06bf41c3cdf..efc81388d86a 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.13
+PORTVERSION=	0.14
 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 47c0e58da2cf..2d56e0dea8a2 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.13.tar.gz) = 14278ee54bef1cf65ee13735b134f9dd
-SHA256 (bzr-0.13.tar.gz) = 3bb3ef28b23b36f840c8b6f69589770764fa1fd97064d26a4f3fff4066d05237
-SIZE (bzr-0.13.tar.gz) = 1126005
+MD5 (bzr-0.14.tar.gz) = 281c777f377cc149b6ba60c720f70033
+SHA256 (bzr-0.14.tar.gz) = c1c47236e985b11069fd432a327cffb5d2de5af4035df22b434f24d916e4749f
+SIZE (bzr-0.14.tar.gz) = 1159335
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index 1d3263235fbe..08de89543d4f 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -21,6 +21,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.py
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/generate_ids.py
+%%PYTHON_SITELIBDIR%%/bzrlib/globbing.py
 %%PYTHON_SITELIBDIR%%/bzrlib/gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.py
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.py
@@ -67,8 +68,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.py
-%%PYTHON_SITELIBDIR%%/bzrlib/textfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/textfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.py
@@ -82,15 +83,39 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/upgrade.py
 %%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/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/xml4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_add.py
@@ -161,30 +186,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_xml.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.py
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v09.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/doc/api/branch.txt
@@ -243,6 +244,7 @@ bin/bzr
 %%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_annotate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.py
@@ -250,7 +252,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_cache_utf8.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commands.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit_merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.py
@@ -262,7 +264,9 @@ 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_docs.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_generate_ids.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_globbing.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.py
@@ -281,13 +285,14 @@ 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
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils_encodings.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.py
@@ -299,8 +304,8 @@ bin/bzr
 %%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_sampler.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.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
@@ -317,8 +322,8 @@ 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_tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.py
@@ -597,10 +602,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/test_all.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.py
@@ -618,6 +626,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_read_working_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_readonly.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.py
@@ -638,6 +647,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_readonly.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
@@ -658,6 +668,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_readonly.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyo
@@ -689,6 +700,7 @@ bin/bzr
 %%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_annotate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyc
@@ -696,7 +708,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_cache_utf8.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit_merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.pyc
@@ -708,7 +720,9 @@ 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_docs.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_generate_ids.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_globbing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.pyc
@@ -727,13 +741,15 @@ 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_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils_encodings.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.pyc
@@ -744,16 +760,15 @@ bin/bzr
 %%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_revisiontree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.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
@@ -763,31 +778,32 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_trace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transactions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_treebuilder.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_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_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/HTTPTestUtil.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_annotate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_atomicfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyo
@@ -795,7 +811,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_cache_utf8.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commands.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.pyo
@@ -807,7 +823,9 @@ 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_docs.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_generate_ids.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_globbing.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.pyo
@@ -826,14 +844,14 @@ 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
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils_encodings.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.pyo
@@ -845,12 +863,13 @@ bin/bzr
 %%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_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
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyo
@@ -863,9 +882,9 @@ 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_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_upgrade.pyo
@@ -994,6 +1013,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/config.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/conflicts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/debug.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/decorators.pyc
@@ -1003,7 +1023,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/generate_ids.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/globbing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyc
@@ -1017,9 +1037,9 @@ 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
@@ -1049,8 +1069,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyc
@@ -1062,20 +1082,20 @@ bin/bzr
 %%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/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/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/branch.pyo
@@ -1084,7 +1104,6 @@ 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
@@ -1097,6 +1116,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/generate_ids.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/globbing.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyo
@@ -1107,9 +1128,9 @@ bin/bzr
 %%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
@@ -1142,8 +1163,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/status.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyo
@@ -1157,20 +1178,20 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyo
 %%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/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/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyo
-@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/benchmarks/tree_creator
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc/api
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/export