- Update to 1.17

PR:		ports/136935
Submitted by:	Matthew D. Fuller <fullermd@over-yonder.net> (maintainer)

6 files changed, 650 insertions, 576 deletions

diff --git a/devel/bazaar-ng/Makefile b/devel/bazaar-ng/Makefile
index 4fc7c6a3216e..67880c20145f 100644
--- a/devel/bazaar-ng/Makefile
+++ b/devel/bazaar-ng/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	1.16.1
+PORTVERSION=	1.17
 CATEGORIES=	devel
-MASTER_SITES=	https://launchpadlibrarian.net/28408215/
+MASTER_SITES=	https://launchpadlibrarian.net/29278796/
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	fullermd@over-yonder.net
diff --git a/devel/bazaar-ng/distinfo b/devel/bazaar-ng/distinfo
index 8c379fa6a8ac..5986e631da39 100644
--- a/devel/bazaar-ng/distinfo
+++ b/devel/bazaar-ng/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-1.16.1.tar.gz) = e04f6de1c3ef9540830f6270131dc303
-SHA256 (bzr-1.16.1.tar.gz) = 97bd05b9859b214bb0811d2d7a93de96004aa97127c02adc58b12d630a268b50
-SIZE (bzr-1.16.1.tar.gz) = 5080912
+MD5 (bzr-1.17.tar.gz) = d772508e60b47a1641fa487c5cf7e08e
+SHA256 (bzr-1.17.tar.gz) = b80413b7d543561b08de54ea988145982737d52f4fcd3dc8084b9294735619dc
+SIZE (bzr-1.17.tar.gz) = 5913890
diff --git a/devel/bazaar-ng/pkg-plist b/devel/bazaar-ng/pkg-plist
index 7e0fb0e901cb..19041bb7a78e 100644
--- a/devel/bazaar-ng/pkg-plist
+++ b/devel/bazaar-ng/pkg-plist
@@ -2,11 +2,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_annotator_py.py
+%%PYTHON_SITELIBDIR%%/bzrlib/_annotator_py.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/_annotator_py.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_annotator_pyx.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_bencode_pyx.so
-%%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_c.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_py.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_pyx.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_chk_map_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_chk_map_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_chk_map_py.pyo
@@ -15,18 +19,22 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/_chunks_to_lines_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_chunks_to_lines_py.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/_chunks_to_lines_pyx.so
-%%PYTHON_SITELIBDIR%%/bzrlib/_dirstate_helpers_c.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_dirstate_helpers_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_dirstate_helpers_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_dirstate_helpers_py.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_dirstate_helpers_pyx.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_groupcompress_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_groupcompress_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_groupcompress_py.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/_groupcompress_pyx.so
-%%PYTHON_SITELIBDIR%%/bzrlib/_knit_load_data_c.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_knit_load_data_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_knit_load_data_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_knit_load_data_py.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_knit_load_data_pyx.so
+%%PYTHON_SITELIBDIR%%/bzrlib/_known_graph_py.py
+%%PYTHON_SITELIBDIR%%/bzrlib/_known_graph_py.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/_known_graph_py.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_known_graph_pyx.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_patiencediff_c.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_patiencediff_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_patiencediff_py.pyc
@@ -248,6 +256,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/doc/api/branch.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/doc/api/transport.txt
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_bash_completion.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_bash_completion.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_bash_completion.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_man.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_man.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_man.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_rstx.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_rstx.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_rstx.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/email_message.py
 %%PYTHON_SITELIBDIR%%/bzrlib/email_message.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/email_message.pyo
@@ -313,6 +333,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/conflicts.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/content-filters.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/debug-flags.txt
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/diverged-branches.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/eol.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/log-formats.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/patterns.txt
@@ -446,6 +467,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_directory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_directory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_directory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_login.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_login.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_login.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_open.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_open.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_open.pyo
@@ -866,99 +890,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_check.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_check.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_check.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_commit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_commit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_commit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_clone.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_clone.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_clone.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_hooks.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_hooks.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_hooks.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_push.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_push.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_push.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_reconcile.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_reconcile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_reconcile.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_history.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_history.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_history.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_revno.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_sprout.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_sprout.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_sprout.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_stacking.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_stacking.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_stacking.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_uncommit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_uncommit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_uncommit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_update.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_update.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_update.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_bzrdir.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_push.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_push.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_push.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/commands/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/commands/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/commands/__init__.pyo
@@ -1019,30 +950,102 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/https_server.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/https_server.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/https_server.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_fetch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_fetch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_fetch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/test_compare.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/test_compare.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/test_compare.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations/basics.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations/basics.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations/basics.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_bound_sftp.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_bound_sftp.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_bound_sftp.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_branch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_check.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_check.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_check.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_create_checkout.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_create_checkout.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_create_checkout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_create_clone.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_create_clone.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_create_clone.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_dotted_revno_to_revision_id.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_dotted_revno_to_revision_id.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_dotted_revno_to_revision_id.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_get_revision_id_to_revno_map.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_get_revision_id_to_revno_map.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_get_revision_id_to_revno_map.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_hooks.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_hooks.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_hooks.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_http.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_http.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_http.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_last_revision_info.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_last_revision_info.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_last_revision_info.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_locking.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_locking.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_locking.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_parent.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_parent.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_parent.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_permissions.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_permissions.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_permissions.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_pull.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_pull.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_pull.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_push.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_push.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_push.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_reconcile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_reconcile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_reconcile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_history.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_history.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_history.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_id_to_dotted_revno.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_id_to_dotted_revno.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_id_to_dotted_revno.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_id_to_revno.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_id_to_revno.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_id_to_revno.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_sprout.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_sprout.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_sprout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_stacking.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_stacking.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_stacking.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_tags.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_tags.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_tags.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_uncommit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_uncommit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_uncommit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_update.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_update.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_update.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/test_bzrdir.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/test_bzrdir.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/test_bzrdir.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/test_push.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/test_push.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/test_push.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.pyo
@@ -1055,6 +1058,27 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/test_fetch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/test_fetch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/test_fetch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/test_interrepository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/test_interrepository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/test_interrepository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree/test_compare.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree/test_compare.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree/test_compare.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory/basics.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory/basics.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory/basics.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.pyo
@@ -1172,12 +1196,177 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_fetch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_fetch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_fetch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_initialize.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_initialize.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_initialize.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_unlock.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_unlock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_unlock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_transport.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_transport.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_transport.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_annotate_iter.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_annotate_iter.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_annotate_iter.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_file_mtime.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_file_mtime.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_file_mtime.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_file_with_stat.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_file_with_stat.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_file_with_stat.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_root_id.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_root_id.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_root_id.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_symlink_target.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_symlink_target.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_symlink_target.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_inv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_inv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_inv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_iter_search_rules.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_iter_search_rules.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_iter_search_rules.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_list_files.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_list_files.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_list_files.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_path_content_summary.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_path_content_summary.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_path_content_summary.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_revision_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_revision_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_revision_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_test_trees.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_test_trees.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_test_trees.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_walkdirs.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_walkdirs.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_walkdirs.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_add_reference.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_add_reference.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_add_reference.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_annotate_iter.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_annotate_iter.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_annotate_iter.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_basis_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_basis_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_basis_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_basis_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_basis_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_basis_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_changes_from.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_changes_from.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_changes_from.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_content_filters.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_content_filters.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_content_filters.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_eol_conversion.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_eol_conversion.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_eol_conversion.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_executable.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_executable.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_executable.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_flush.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_flush.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_flush.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_get_file_mtime.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_get_file_mtime.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_get_file_mtime.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_get_parent_ids.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_get_parent_ids.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_get_parent_ids.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_inv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_inv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_inv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_is_control_filename.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_is_control_filename.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_is_control_filename.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_is_ignored.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_is_ignored.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_is_ignored.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_locking.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_locking.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_locking.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_merge_from_branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_merge_from_branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_merge_from_branch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_mkdir.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_mkdir.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_mkdir.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_move.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_move.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_move.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_nested_specifics.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_nested_specifics.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_nested_specifics.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_parents.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_parents.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_parents.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_paths2ids.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_paths2ids.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_paths2ids.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_pull.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_pull.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_pull.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_put_file.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_put_file.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_put_file.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_read_working_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_read_working_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_read_working_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_readonly.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_readonly.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_readonly.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_remove.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_remove.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_remove.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_rename_one.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_rename_one.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_rename_one.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_revision_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_revision_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_revision_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_set_root_id.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_set_root_id.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_set_root_id.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_smart_add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_smart_add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_smart_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_uncommit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_uncommit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_uncommit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_unversion.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_unversion.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_unversion.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_views.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_views.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_views.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_walkdirs.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_walkdirs.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_walkdirs.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.pyo
@@ -1187,6 +1376,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__annotator.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__annotator.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__annotator.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__chk_map.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__chk_map.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__chk_map.pyo
@@ -1199,6 +1391,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__groupcompress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__groupcompress.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__groupcompress.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__known_graph.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__known_graph.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__known_graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__rio.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__rio.pyo
@@ -1618,9 +1813,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_log.pyo
@@ -1684,165 +1876,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/transport_util.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/transport_util.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/transport_util.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_annotate_iter.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_annotate_iter.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_annotate_iter.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_with_stat.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_with_stat.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_with_stat.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_inv.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_inv.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_inv.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_iter_search_rules.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_iter_search_rules.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_iter_search_rules.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_list_files.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_list_files.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_list_files.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_path_content_summary.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_path_content_summary.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_path_content_summary.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_revision_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_revision_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_revision_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_walkdirs.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_walkdirs.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_walkdirs.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_content_filters.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_content_filters.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_content_filters.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_eol_conversion.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_eol_conversion.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_eol_conversion.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_flush.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_flush.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_flush.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_merge_from_branch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_merge_from_branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_merge_from_branch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_mkdir.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_mkdir.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_mkdir.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_move.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_move.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_move.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_read_working_inventory.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_readonly.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_readonly.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_readonly.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_remove.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_remove.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_remove.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_rename_one.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_rename_one.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_rename_one.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_revision_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_revision_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_revision_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_smart_add.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_smart_add.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_smart_add.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_uncommit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_uncommit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_uncommit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_views.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_views.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_views.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyo
@@ -2073,6 +2109,7 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc/api
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc_generate
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/export
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/filters
@@ -2087,22 +2124,22 @@ bin/bzr
 @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/commands
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/ftp_server
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_chk
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport/ftp
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport/http
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 4fc7c6a3216e..67880c20145f 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	1.16.1
+PORTVERSION=	1.17
 CATEGORIES=	devel
-MASTER_SITES=	https://launchpadlibrarian.net/28408215/
+MASTER_SITES=	https://launchpadlibrarian.net/29278796/
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	fullermd@over-yonder.net
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 8c379fa6a8ac..5986e631da39 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-1.16.1.tar.gz) = e04f6de1c3ef9540830f6270131dc303
-SHA256 (bzr-1.16.1.tar.gz) = 97bd05b9859b214bb0811d2d7a93de96004aa97127c02adc58b12d630a268b50
-SIZE (bzr-1.16.1.tar.gz) = 5080912
+MD5 (bzr-1.17.tar.gz) = d772508e60b47a1641fa487c5cf7e08e
+SHA256 (bzr-1.17.tar.gz) = b80413b7d543561b08de54ea988145982737d52f4fcd3dc8084b9294735619dc
+SIZE (bzr-1.17.tar.gz) = 5913890
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index 7e0fb0e901cb..19041bb7a78e 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -2,11 +2,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_annotator_py.py
+%%PYTHON_SITELIBDIR%%/bzrlib/_annotator_py.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/_annotator_py.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_annotator_pyx.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_bencode_pyx.so
-%%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_c.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_py.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_pyx.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_chk_map_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_chk_map_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_chk_map_py.pyo
@@ -15,18 +19,22 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/_chunks_to_lines_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_chunks_to_lines_py.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/_chunks_to_lines_pyx.so
-%%PYTHON_SITELIBDIR%%/bzrlib/_dirstate_helpers_c.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_dirstate_helpers_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_dirstate_helpers_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_dirstate_helpers_py.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_dirstate_helpers_pyx.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_groupcompress_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_groupcompress_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_groupcompress_py.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/_groupcompress_pyx.so
-%%PYTHON_SITELIBDIR%%/bzrlib/_knit_load_data_c.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_knit_load_data_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_knit_load_data_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_knit_load_data_py.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_knit_load_data_pyx.so
+%%PYTHON_SITELIBDIR%%/bzrlib/_known_graph_py.py
+%%PYTHON_SITELIBDIR%%/bzrlib/_known_graph_py.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/_known_graph_py.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_known_graph_pyx.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_patiencediff_c.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_patiencediff_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_patiencediff_py.pyc
@@ -248,6 +256,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/doc/api/branch.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/doc/api/transport.txt
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_bash_completion.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_bash_completion.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_bash_completion.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_man.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_man.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_man.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_rstx.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_rstx.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc_generate/autodoc_rstx.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/email_message.py
 %%PYTHON_SITELIBDIR%%/bzrlib/email_message.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/email_message.pyo
@@ -313,6 +333,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/conflicts.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/content-filters.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/debug-flags.txt
+%%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/diverged-branches.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/eol.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/log-formats.txt
 %%PYTHON_SITELIBDIR%%/bzrlib/help_topics/en/patterns.txt
@@ -446,6 +467,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_directory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_directory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_directory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_login.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_login.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_login.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_open.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_open.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_open.pyo
@@ -866,99 +890,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_check.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_check.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_check.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_commit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_commit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_commit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_clone.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_clone.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_clone.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_hooks.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_hooks.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_hooks.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_push.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_push.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_push.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_reconcile.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_reconcile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_reconcile.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_history.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_history.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_history.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_revno.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_sprout.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_sprout.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_sprout.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_stacking.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_stacking.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_stacking.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_uncommit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_uncommit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_uncommit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_update.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_update.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_update.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_bzrdir.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_push.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_push.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_push.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/commands/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/commands/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/commands/__init__.pyo
@@ -1019,30 +950,102 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/https_server.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/https_server.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/https_server.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_fetch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_fetch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_fetch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/test_compare.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/test_compare.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/test_compare.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations/basics.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations/basics.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations/basics.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_bound_sftp.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_bound_sftp.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_bound_sftp.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_branch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_check.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_check.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_check.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_create_checkout.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_create_checkout.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_create_checkout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_create_clone.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_create_clone.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_create_clone.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_dotted_revno_to_revision_id.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_dotted_revno_to_revision_id.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_dotted_revno_to_revision_id.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_get_revision_id_to_revno_map.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_get_revision_id_to_revno_map.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_get_revision_id_to_revno_map.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_hooks.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_hooks.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_hooks.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_http.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_http.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_http.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_last_revision_info.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_last_revision_info.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_last_revision_info.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_locking.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_locking.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_locking.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_parent.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_parent.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_parent.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_permissions.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_permissions.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_permissions.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_pull.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_pull.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_pull.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_push.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_push.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_push.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_reconcile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_reconcile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_reconcile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_history.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_history.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_history.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_id_to_dotted_revno.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_id_to_dotted_revno.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_id_to_dotted_revno.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_id_to_revno.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_id_to_revno.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_revision_id_to_revno.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_sprout.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_sprout.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_sprout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_stacking.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_stacking.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_stacking.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_tags.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_tags.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_tags.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_uncommit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_uncommit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_uncommit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_update.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_update.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch/test_update.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/test_bzrdir.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/test_bzrdir.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/test_bzrdir.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/test_push.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/test_push.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir/test_push.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.pyo
@@ -1055,6 +1058,27 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/test_fetch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/test_fetch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/test_fetch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/test_interrepository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/test_interrepository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository/test_interrepository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree/test_compare.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree/test_compare.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree/test_compare.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory/basics.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory/basics.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory/basics.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.pyo
@@ -1172,12 +1196,177 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_fetch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_fetch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_fetch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_initialize.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_initialize.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_initialize.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_unlock.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_unlock.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_unlock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_transport.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_transport.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_transport.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_annotate_iter.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_annotate_iter.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_annotate_iter.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_file_mtime.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_file_mtime.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_file_mtime.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_file_with_stat.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_file_with_stat.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_file_with_stat.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_root_id.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_root_id.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_root_id.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_symlink_target.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_symlink_target.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_get_symlink_target.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_inv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_inv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_inv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_iter_search_rules.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_iter_search_rules.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_iter_search_rules.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_list_files.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_list_files.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_list_files.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_path_content_summary.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_path_content_summary.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_path_content_summary.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_revision_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_revision_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_revision_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_test_trees.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_test_trees.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_test_trees.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_walkdirs.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_walkdirs.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree/test_walkdirs.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_add_reference.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_add_reference.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_add_reference.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_annotate_iter.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_annotate_iter.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_annotate_iter.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_basis_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_basis_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_basis_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_basis_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_basis_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_basis_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_changes_from.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_changes_from.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_changes_from.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_content_filters.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_content_filters.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_content_filters.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_eol_conversion.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_eol_conversion.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_eol_conversion.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_executable.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_executable.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_executable.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_flush.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_flush.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_flush.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_get_file_mtime.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_get_file_mtime.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_get_file_mtime.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_get_parent_ids.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_get_parent_ids.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_get_parent_ids.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_inv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_inv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_inv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_is_control_filename.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_is_control_filename.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_is_control_filename.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_is_ignored.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_is_ignored.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_is_ignored.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_locking.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_locking.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_locking.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_merge_from_branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_merge_from_branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_merge_from_branch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_mkdir.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_mkdir.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_mkdir.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_move.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_move.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_move.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_nested_specifics.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_nested_specifics.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_nested_specifics.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_parents.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_parents.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_parents.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_paths2ids.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_paths2ids.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_paths2ids.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_pull.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_pull.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_pull.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_put_file.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_put_file.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_put_file.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_read_working_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_read_working_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_read_working_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_readonly.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_readonly.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_readonly.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_remove.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_remove.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_remove.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_rename_one.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_rename_one.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_rename_one.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_revision_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_revision_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_revision_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_set_root_id.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_set_root_id.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_set_root_id.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_smart_add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_smart_add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_smart_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_uncommit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_uncommit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_uncommit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_unversion.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_unversion.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_unversion.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_views.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_views.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_views.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_walkdirs.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_walkdirs.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_walkdirs.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree/test_workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.pyo
@@ -1187,6 +1376,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__annotator.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__annotator.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__annotator.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__chk_map.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__chk_map.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__chk_map.pyo
@@ -1199,6 +1391,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__groupcompress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__groupcompress.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__groupcompress.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__known_graph.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__known_graph.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__known_graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__rio.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__rio.pyo
@@ -1618,9 +1813,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_log.pyo
@@ -1684,165 +1876,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/transport_util.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/transport_util.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/transport_util.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_annotate_iter.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_annotate_iter.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_annotate_iter.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_with_stat.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_with_stat.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_with_stat.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_inv.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_inv.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_inv.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_iter_search_rules.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_iter_search_rules.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_iter_search_rules.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_list_files.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_list_files.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_list_files.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_path_content_summary.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_path_content_summary.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_path_content_summary.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_revision_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_revision_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_revision_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_walkdirs.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_walkdirs.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_walkdirs.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_content_filters.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_content_filters.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_content_filters.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_eol_conversion.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_eol_conversion.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_eol_conversion.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_flush.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_flush.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_flush.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_merge_from_branch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_merge_from_branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_merge_from_branch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_mkdir.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_mkdir.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_mkdir.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_move.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_move.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_move.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_parents.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_put_file.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_read_working_inventory.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_readonly.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_readonly.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_readonly.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_remove.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_remove.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_remove.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_rename_one.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_rename_one.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_rename_one.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_revision_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_revision_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_revision_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_smart_add.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_smart_add.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_smart_add.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_uncommit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_uncommit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_uncommit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_views.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_views.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_views.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyo
@@ -2073,6 +2109,7 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc/api
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc_generate
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/export
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/filters
@@ -2087,22 +2124,22 @@ bin/bzr
 @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/commands
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/ftp_server
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/inventory_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_branch
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_bzrdir
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interrepository
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_intertree
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_inventory
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_chk
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_tree
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_workingtree
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport/ftp
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport/http