Update to 1.17, based on patches by Jan Danielsson.

Bazaar continues to blaze a straight and shining path to the 2.0 release and
the elevation of the ``2a`` beta format to the full glory of "supported and
stable".

Highlights in this release include greatly reduced memory consumption during
commits, faster ``ls``, faster ``annotate``, faster network operations if
you're specifying a revision number and the final destruction of those
annoying progress bar artifacts.

4 files changed, 329 insertions, 293 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index cfa9d2f8cc6..a668ae285b0 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.39 2009/07/02 05:23:08 epg Exp $
+# $NetBSD: Makefile,v 1.40 2009/08/08 15:52:08 wiz Exp $
 
 DISTNAME=		bzr-${VER}
 #PKGREVISION=		1
 CATEGORIES=		devel scm
-MASTER_SITES=		http://launchpad.net/bzr/1.16/${VER}/+download/
-VER=			1.16.1
+MASTER_SITES=		http://launchpad.net/bzr/1.17/${VER}/+download/
+VER=			1.17
 
 MAINTAINER=		epg@NetBSD.org
 HOMEPAGE=		http://bazaar-vcs.org/
@@ -20,7 +20,7 @@ USE_TOOLS+=		gmake
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
 
-PYTHON_VERSIONS_ACCEPTED=	25 24
+PYTHON_VERSIONS_ACCEPTED=	26 25 24
 PYTHON_PATCH_SCRIPTS=		bzr bzrlib/weave.py
 
 .include "../../mk/bsd.prefs.mk"
@@ -36,7 +36,7 @@ SUBST_FILES.python+=		Makefile
 SUBST_SED.python+=		-e 's,=python,=${PYTHONBIN},'
 
 post-build:
-	cd ${WRKSRC} && ${PYTHONBIN} generate_docs.py man
+	cd ${WRKSRC} && ${PYTHONBIN} tools/generate_docs.py man
 
 do-test:
 #	XXX shouldn't HOME=FAKEHOME already be set?
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index fd00fe42cc1..c79349aeefb 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.28 2009/07/02 06:08:36 epg Exp $
+@comment $NetBSD: PLIST,v 1.29 2009/08/08 15:52:08 wiz Exp $
 bin/bzr
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
 ${PYSITELIB}/bzrlib/__init__.pyo
+${PYSITELIB}/bzrlib/_annotator_py.py
+${PYSITELIB}/bzrlib/_annotator_py.pyc
+${PYSITELIB}/bzrlib/_annotator_py.pyo
+${PYSITELIB}/bzrlib/_annotator_pyx.so
 ${PYSITELIB}/bzrlib/_bencode_pyx.so
-${PYSITELIB}/bzrlib/_btree_serializer_c.so
 ${PYSITELIB}/bzrlib/_btree_serializer_py.py
 ${PYSITELIB}/bzrlib/_btree_serializer_py.pyc
 ${PYSITELIB}/bzrlib/_btree_serializer_py.pyo
+${PYSITELIB}/bzrlib/_btree_serializer_pyx.so
 ${PYSITELIB}/bzrlib/_chk_map_py.py
 ${PYSITELIB}/bzrlib/_chk_map_py.pyc
 ${PYSITELIB}/bzrlib/_chk_map_py.pyo
@@ -16,18 +20,22 @@ ${PYSITELIB}/bzrlib/_chunks_to_lines_py.py
 ${PYSITELIB}/bzrlib/_chunks_to_lines_py.pyc
 ${PYSITELIB}/bzrlib/_chunks_to_lines_py.pyo
 ${PYSITELIB}/bzrlib/_chunks_to_lines_pyx.so
-${PYSITELIB}/bzrlib/_dirstate_helpers_c.so
 ${PYSITELIB}/bzrlib/_dirstate_helpers_py.py
 ${PYSITELIB}/bzrlib/_dirstate_helpers_py.pyc
 ${PYSITELIB}/bzrlib/_dirstate_helpers_py.pyo
+${PYSITELIB}/bzrlib/_dirstate_helpers_pyx.so
 ${PYSITELIB}/bzrlib/_groupcompress_py.py
 ${PYSITELIB}/bzrlib/_groupcompress_py.pyc
 ${PYSITELIB}/bzrlib/_groupcompress_py.pyo
 ${PYSITELIB}/bzrlib/_groupcompress_pyx.so
-${PYSITELIB}/bzrlib/_knit_load_data_c.so
 ${PYSITELIB}/bzrlib/_knit_load_data_py.py
 ${PYSITELIB}/bzrlib/_knit_load_data_py.pyc
 ${PYSITELIB}/bzrlib/_knit_load_data_py.pyo
+${PYSITELIB}/bzrlib/_knit_load_data_pyx.so
+${PYSITELIB}/bzrlib/_known_graph_py.py
+${PYSITELIB}/bzrlib/_known_graph_py.pyc
+${PYSITELIB}/bzrlib/_known_graph_py.pyo
+${PYSITELIB}/bzrlib/_known_graph_pyx.so
 ${PYSITELIB}/bzrlib/_patiencediff_c.so
 ${PYSITELIB}/bzrlib/_patiencediff_py.py
 ${PYSITELIB}/bzrlib/_patiencediff_py.pyc
@@ -249,6 +257,18 @@ ${PYSITELIB}/bzrlib/doc/api/__init__.pyc
 ${PYSITELIB}/bzrlib/doc/api/__init__.pyo
 ${PYSITELIB}/bzrlib/doc/api/branch.txt
 ${PYSITELIB}/bzrlib/doc/api/transport.txt
+${PYSITELIB}/bzrlib/doc_generate/__init__.py
+${PYSITELIB}/bzrlib/doc_generate/__init__.pyc
+${PYSITELIB}/bzrlib/doc_generate/__init__.pyo
+${PYSITELIB}/bzrlib/doc_generate/autodoc_bash_completion.py
+${PYSITELIB}/bzrlib/doc_generate/autodoc_bash_completion.pyc
+${PYSITELIB}/bzrlib/doc_generate/autodoc_bash_completion.pyo
+${PYSITELIB}/bzrlib/doc_generate/autodoc_man.py
+${PYSITELIB}/bzrlib/doc_generate/autodoc_man.pyc
+${PYSITELIB}/bzrlib/doc_generate/autodoc_man.pyo
+${PYSITELIB}/bzrlib/doc_generate/autodoc_rstx.py
+${PYSITELIB}/bzrlib/doc_generate/autodoc_rstx.pyc
+${PYSITELIB}/bzrlib/doc_generate/autodoc_rstx.pyo
 ${PYSITELIB}/bzrlib/email_message.py
 ${PYSITELIB}/bzrlib/email_message.pyc
 ${PYSITELIB}/bzrlib/email_message.pyo
@@ -314,6 +334,7 @@ ${PYSITELIB}/bzrlib/help_topics/en/configuration.txt
 ${PYSITELIB}/bzrlib/help_topics/en/conflicts.txt
 ${PYSITELIB}/bzrlib/help_topics/en/content-filters.txt
 ${PYSITELIB}/bzrlib/help_topics/en/debug-flags.txt
+${PYSITELIB}/bzrlib/help_topics/en/diverged-branches.txt
 ${PYSITELIB}/bzrlib/help_topics/en/eol.txt
 ${PYSITELIB}/bzrlib/help_topics/en/log-formats.txt
 ${PYSITELIB}/bzrlib/help_topics/en/patterns.txt
@@ -447,6 +468,9 @@ ${PYSITELIB}/bzrlib/plugins/launchpad/test_account.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_directory.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_directory.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_directory.pyo
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_login.py
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_login.pyc
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_login.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_open.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_open.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_open.pyo
@@ -867,99 +891,6 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_view.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_whoami.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_whoami.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_whoami.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/__init__.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/__init__.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/__init__.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_bound_sftp.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_bound_sftp.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_bound_sftp.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_branch.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_branch.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_branch.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_break_lock.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_break_lock.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_break_lock.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_check.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_check.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_check.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_commit.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_commit.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_commit.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_create_checkout.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_create_checkout.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_create_checkout.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_create_clone.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_create_clone.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_create_clone.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_hooks.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_hooks.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_hooks.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_http.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_http.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_http.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_last_revision_info.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_last_revision_info.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_last_revision_info.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_locking.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_locking.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_locking.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_parent.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_parent.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_parent.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_permissions.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_permissions.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_permissions.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_pull.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_pull.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_pull.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_push.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_push.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_push.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_reconcile.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_reconcile.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_reconcile.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_history.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_history.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_history.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_id_to_revno.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_sprout.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_sprout.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_sprout.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_stacking.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_stacking.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_stacking.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_tags.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_tags.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_tags.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_uncommit.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_uncommit.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_uncommit.pyo
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_update.py
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_update.pyc
-${PYSITELIB}/bzrlib/tests/branch_implementations/test_update.pyo
-${PYSITELIB}/bzrlib/tests/bzrdir_implementations/__init__.py
-${PYSITELIB}/bzrlib/tests/bzrdir_implementations/__init__.pyc
-${PYSITELIB}/bzrlib/tests/bzrdir_implementations/__init__.pyo
-${PYSITELIB}/bzrlib/tests/bzrdir_implementations/test_bzrdir.py
-${PYSITELIB}/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyc
-${PYSITELIB}/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyo
-${PYSITELIB}/bzrlib/tests/bzrdir_implementations/test_push.py
-${PYSITELIB}/bzrlib/tests/bzrdir_implementations/test_push.pyc
-${PYSITELIB}/bzrlib/tests/bzrdir_implementations/test_push.pyo
 ${PYSITELIB}/bzrlib/tests/commands/__init__.py
 ${PYSITELIB}/bzrlib/tests/commands/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/commands/__init__.pyo
@@ -1020,30 +951,102 @@ ${PYSITELIB}/bzrlib/tests/http_utils.pyo
 ${PYSITELIB}/bzrlib/tests/https_server.py
 ${PYSITELIB}/bzrlib/tests/https_server.pyc
 ${PYSITELIB}/bzrlib/tests/https_server.pyo
-${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.py
-${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.pyc
-${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.pyo
-${PYSITELIB}/bzrlib/tests/interrepository_implementations/test_fetch.py
-${PYSITELIB}/bzrlib/tests/interrepository_implementations/test_fetch.pyc
-${PYSITELIB}/bzrlib/tests/interrepository_implementations/test_fetch.pyo
-${PYSITELIB}/bzrlib/tests/interrepository_implementations/test_interrepository.py
-${PYSITELIB}/bzrlib/tests/interrepository_implementations/test_interrepository.pyc
-${PYSITELIB}/bzrlib/tests/interrepository_implementations/test_interrepository.pyo
-${PYSITELIB}/bzrlib/tests/intertree_implementations/__init__.py
-${PYSITELIB}/bzrlib/tests/intertree_implementations/__init__.pyc
-${PYSITELIB}/bzrlib/tests/intertree_implementations/__init__.pyo
-${PYSITELIB}/bzrlib/tests/intertree_implementations/test_compare.py
-${PYSITELIB}/bzrlib/tests/intertree_implementations/test_compare.pyc
-${PYSITELIB}/bzrlib/tests/intertree_implementations/test_compare.pyo
-${PYSITELIB}/bzrlib/tests/inventory_implementations/__init__.py
-${PYSITELIB}/bzrlib/tests/inventory_implementations/__init__.pyc
-${PYSITELIB}/bzrlib/tests/inventory_implementations/__init__.pyo
-${PYSITELIB}/bzrlib/tests/inventory_implementations/basics.py
-${PYSITELIB}/bzrlib/tests/inventory_implementations/basics.pyc
-${PYSITELIB}/bzrlib/tests/inventory_implementations/basics.pyo
 ${PYSITELIB}/bzrlib/tests/lock_helpers.py
 ${PYSITELIB}/bzrlib/tests/lock_helpers.pyc
 ${PYSITELIB}/bzrlib/tests/lock_helpers.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/__init__.py
+${PYSITELIB}/bzrlib/tests/per_branch/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_bound_sftp.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_bound_sftp.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_bound_sftp.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_branch.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_branch.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_branch.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_break_lock.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_break_lock.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_break_lock.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_check.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_check.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_check.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_commit.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_commit.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_commit.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_create_checkout.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_create_checkout.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_create_checkout.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_create_clone.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_create_clone.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_create_clone.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_dotted_revno_to_revision_id.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_dotted_revno_to_revision_id.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_dotted_revno_to_revision_id.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_get_revision_id_to_revno_map.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_get_revision_id_to_revno_map.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_get_revision_id_to_revno_map.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_hooks.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_hooks.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_hooks.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_http.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_http.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_http.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_last_revision_info.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_last_revision_info.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_last_revision_info.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_locking.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_locking.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_locking.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_parent.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_parent.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_parent.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_permissions.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_permissions.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_permissions.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_pull.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_pull.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_pull.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_push.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_push.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_push.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_reconcile.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_reconcile.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_reconcile.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_revision_history.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_revision_history.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_revision_history.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_revision_id_to_dotted_revno.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_revision_id_to_dotted_revno.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_revision_id_to_dotted_revno.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_revision_id_to_revno.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_revision_id_to_revno.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_revision_id_to_revno.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_sprout.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_sprout.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_sprout.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_stacking.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_stacking.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_stacking.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_tags.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_tags.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_tags.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_uncommit.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_uncommit.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_uncommit.pyo
+${PYSITELIB}/bzrlib/tests/per_branch/test_update.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_update.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_update.pyo
+${PYSITELIB}/bzrlib/tests/per_bzrdir/__init__.py
+${PYSITELIB}/bzrlib/tests/per_bzrdir/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_bzrdir/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_bzrdir/test_bzrdir.py
+${PYSITELIB}/bzrlib/tests/per_bzrdir/test_bzrdir.pyc
+${PYSITELIB}/bzrlib/tests/per_bzrdir/test_bzrdir.pyo
+${PYSITELIB}/bzrlib/tests/per_bzrdir/test_push.py
+${PYSITELIB}/bzrlib/tests/per_bzrdir/test_push.pyc
+${PYSITELIB}/bzrlib/tests/per_bzrdir/test_push.pyo
 ${PYSITELIB}/bzrlib/tests/per_interbranch/__init__.py
 ${PYSITELIB}/bzrlib/tests/per_interbranch/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/per_interbranch/__init__.pyo
@@ -1056,6 +1059,27 @@ ${PYSITELIB}/bzrlib/tests/per_interbranch/test_push.pyo
 ${PYSITELIB}/bzrlib/tests/per_interbranch/test_update_revisions.py
 ${PYSITELIB}/bzrlib/tests/per_interbranch/test_update_revisions.pyc
 ${PYSITELIB}/bzrlib/tests/per_interbranch/test_update_revisions.pyo
+${PYSITELIB}/bzrlib/tests/per_interrepository/__init__.py
+${PYSITELIB}/bzrlib/tests/per_interrepository/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_interrepository/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_interrepository/test_fetch.py
+${PYSITELIB}/bzrlib/tests/per_interrepository/test_fetch.pyc
+${PYSITELIB}/bzrlib/tests/per_interrepository/test_fetch.pyo
+${PYSITELIB}/bzrlib/tests/per_interrepository/test_interrepository.py
+${PYSITELIB}/bzrlib/tests/per_interrepository/test_interrepository.pyc
+${PYSITELIB}/bzrlib/tests/per_interrepository/test_interrepository.pyo
+${PYSITELIB}/bzrlib/tests/per_intertree/__init__.py
+${PYSITELIB}/bzrlib/tests/per_intertree/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_intertree/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_intertree/test_compare.py
+${PYSITELIB}/bzrlib/tests/per_intertree/test_compare.pyc
+${PYSITELIB}/bzrlib/tests/per_intertree/test_compare.pyo
+${PYSITELIB}/bzrlib/tests/per_inventory/__init__.py
+${PYSITELIB}/bzrlib/tests/per_inventory/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_inventory/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_inventory/basics.py
+${PYSITELIB}/bzrlib/tests/per_inventory/basics.pyc
+${PYSITELIB}/bzrlib/tests/per_inventory/basics.pyo
 ${PYSITELIB}/bzrlib/tests/per_lock/__init__.py
 ${PYSITELIB}/bzrlib/tests/per_lock/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/per_lock/__init__.pyo
@@ -1173,12 +1197,177 @@ ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_default_stacking.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_fetch.py
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_fetch.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_fetch.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.py
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_initialize.py
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_initialize.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_initialize.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_unlock.py
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_unlock.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_unlock.pyo
+${PYSITELIB}/bzrlib/tests/per_transport.py
+${PYSITELIB}/bzrlib/tests/per_transport.pyc
+${PYSITELIB}/bzrlib/tests/per_transport.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/__init__.py
+${PYSITELIB}/bzrlib/tests/per_tree/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_annotate_iter.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_annotate_iter.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_annotate_iter.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_get_file_mtime.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_get_file_mtime.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_get_file_mtime.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_get_file_with_stat.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_get_file_with_stat.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_get_file_with_stat.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_get_root_id.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_get_root_id.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_get_root_id.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_get_symlink_target.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_get_symlink_target.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_get_symlink_target.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_inv.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_inv.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_inv.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_iter_search_rules.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_iter_search_rules.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_iter_search_rules.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_list_files.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_list_files.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_list_files.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_path_content_summary.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_path_content_summary.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_path_content_summary.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_revision_tree.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_revision_tree.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_revision_tree.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_test_trees.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_test_trees.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_test_trees.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_tree.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_tree.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_tree.pyo
+${PYSITELIB}/bzrlib/tests/per_tree/test_walkdirs.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_walkdirs.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_walkdirs.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/__init__.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_add.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_add.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_add.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_add_reference.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_add_reference.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_add_reference.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_annotate_iter.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_annotate_iter.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_annotate_iter.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_basis_inventory.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_basis_inventory.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_basis_inventory.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_basis_tree.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_basis_tree.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_basis_tree.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_break_lock.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_break_lock.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_break_lock.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_changes_from.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_changes_from.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_changes_from.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_commit.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_commit.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_commit.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_content_filters.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_content_filters.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_content_filters.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_eol_conversion.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_eol_conversion.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_eol_conversion.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_executable.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_executable.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_executable.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_flush.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_flush.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_flush.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_get_file_mtime.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_get_file_mtime.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_get_file_mtime.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_get_parent_ids.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_get_parent_ids.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_get_parent_ids.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_inv.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_inv.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_inv.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_is_control_filename.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_is_control_filename.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_is_control_filename.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_is_ignored.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_is_ignored.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_is_ignored.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_locking.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_locking.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_locking.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_merge_from_branch.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_merge_from_branch.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_merge_from_branch.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_mkdir.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_mkdir.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_mkdir.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_move.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_move.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_move.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_nested_specifics.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_nested_specifics.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_nested_specifics.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_parents.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_parents.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_parents.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_paths2ids.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_paths2ids.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_paths2ids.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_pull.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_pull.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_pull.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_put_file.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_put_file.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_put_file.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_read_working_inventory.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_read_working_inventory.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_read_working_inventory.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_readonly.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_readonly.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_readonly.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_remove.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_remove.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_remove.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_rename_one.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_rename_one.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_rename_one.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_revision_tree.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_revision_tree.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_revision_tree.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_set_root_id.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_set_root_id.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_set_root_id.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_smart_add.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_smart_add.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_smart_add.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_uncommit.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_uncommit.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_uncommit.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_unversion.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_unversion.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_unversion.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_views.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_views.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_views.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_walkdirs.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_walkdirs.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_walkdirs.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_workingtree.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_workingtree.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_workingtree.pyo
 ${PYSITELIB}/bzrlib/tests/ssl_certs/__init__.py
 ${PYSITELIB}/bzrlib/tests/ssl_certs/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/ssl_certs/__init__.pyo
@@ -1188,6 +1377,9 @@ ${PYSITELIB}/bzrlib/tests/ssl_certs/create_ssls.pyo
 ${PYSITELIB}/bzrlib/tests/stub_sftp.py
 ${PYSITELIB}/bzrlib/tests/stub_sftp.pyc
 ${PYSITELIB}/bzrlib/tests/stub_sftp.pyo
+${PYSITELIB}/bzrlib/tests/test__annotator.py
+${PYSITELIB}/bzrlib/tests/test__annotator.pyc
+${PYSITELIB}/bzrlib/tests/test__annotator.pyo
 ${PYSITELIB}/bzrlib/tests/test__chk_map.py
 ${PYSITELIB}/bzrlib/tests/test__chk_map.pyc
 ${PYSITELIB}/bzrlib/tests/test__chk_map.pyo
@@ -1200,6 +1392,9 @@ ${PYSITELIB}/bzrlib/tests/test__dirstate_helpers.pyo
 ${PYSITELIB}/bzrlib/tests/test__groupcompress.py
 ${PYSITELIB}/bzrlib/tests/test__groupcompress.pyc
 ${PYSITELIB}/bzrlib/tests/test__groupcompress.pyo
+${PYSITELIB}/bzrlib/tests/test__known_graph.py
+${PYSITELIB}/bzrlib/tests/test__known_graph.pyc
+${PYSITELIB}/bzrlib/tests/test__known_graph.pyo
 ${PYSITELIB}/bzrlib/tests/test__rio.py
 ${PYSITELIB}/bzrlib/tests/test__rio.pyc
 ${PYSITELIB}/bzrlib/tests/test__rio.pyo
@@ -1619,9 +1814,6 @@ ${PYSITELIB}/bzrlib/tests/test_transform.pyo
 ${PYSITELIB}/bzrlib/tests/test_transport.py
 ${PYSITELIB}/bzrlib/tests/test_transport.pyc
 ${PYSITELIB}/bzrlib/tests/test_transport.pyo
-${PYSITELIB}/bzrlib/tests/test_transport_implementations.py
-${PYSITELIB}/bzrlib/tests/test_transport_implementations.pyc
-${PYSITELIB}/bzrlib/tests/test_transport_implementations.pyo
 ${PYSITELIB}/bzrlib/tests/test_transport_log.py
 ${PYSITELIB}/bzrlib/tests/test_transport_log.pyc
 ${PYSITELIB}/bzrlib/tests/test_transport_log.pyo
@@ -1685,165 +1877,9 @@ ${PYSITELIB}/bzrlib/tests/test_xml.pyo
 ${PYSITELIB}/bzrlib/tests/transport_util.py
 ${PYSITELIB}/bzrlib/tests/transport_util.pyc
 ${PYSITELIB}/bzrlib/tests/transport_util.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/__init__.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/__init__.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/__init__.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_annotate_iter.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_annotate_iter.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_annotate_iter.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_file_mtime.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_file_mtime.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_file_with_stat.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_file_with_stat.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_file_with_stat.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_root_id.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_root_id.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_root_id.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_symlink_target.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_symlink_target.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_symlink_target.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_inv.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_inv.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_inv.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_iter_search_rules.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_iter_search_rules.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_iter_search_rules.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_list_files.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_list_files.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_list_files.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_path_content_summary.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_path_content_summary.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_path_content_summary.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_revision_tree.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_revision_tree.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_revision_tree.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_test_trees.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_test_trees.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_test_trees.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_tree.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_tree.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_tree.pyo
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_walkdirs.py
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_walkdirs.pyc
-${PYSITELIB}/bzrlib/tests/tree_implementations/test_walkdirs.pyo
 ${PYSITELIB}/bzrlib/tests/treeshape.py
 ${PYSITELIB}/bzrlib/tests/treeshape.pyc
 ${PYSITELIB}/bzrlib/tests/treeshape.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/__init__.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/__init__.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/__init__.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_add.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_add.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_add.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_add_reference.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_add_reference.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_add_reference.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_basis_inventory.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_basis_tree.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_basis_tree.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_basis_tree.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_break_lock.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_break_lock.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_break_lock.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_changes_from.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_changes_from.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_changes_from.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_commit.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_commit.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_commit.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_content_filters.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_content_filters.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_content_filters.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_eol_conversion.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_eol_conversion.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_eol_conversion.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_executable.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_executable.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_executable.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_flush.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_flush.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_flush.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_file_mtime.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_inv.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_inv.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_inv.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_ignored.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_ignored.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_ignored.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_locking.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_locking.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_locking.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_merge_from_branch.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_merge_from_branch.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_merge_from_branch.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_mkdir.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_mkdir.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_mkdir.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_move.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_move.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_move.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_nested_specifics.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_parents.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_parents.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_parents.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_paths2ids.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_paths2ids.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_paths2ids.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_pull.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_pull.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_pull.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_put_file.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_put_file.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_put_file.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_read_working_inventory.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_readonly.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_readonly.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_readonly.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_remove.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_remove.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_remove.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_rename_one.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_rename_one.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_rename_one.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_revision_tree.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_revision_tree.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_revision_tree.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_set_root_id.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_set_root_id.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_set_root_id.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_smart_add.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_smart_add.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_smart_add.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_uncommit.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_uncommit.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_uncommit.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_unversion.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_unversion.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_unversion.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_views.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_views.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_views.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_walkdirs.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_walkdirs.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_walkdirs.pyo
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_workingtree.py
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
-${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_workingtree.pyo
 ${PYSITELIB}/bzrlib/textfile.py
 ${PYSITELIB}/bzrlib/textfile.pyc
 ${PYSITELIB}/bzrlib/textfile.pyo
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index a10d4edcab5..d504b1119f8 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.31 2009/07/02 05:23:08 epg Exp $
+$NetBSD: distinfo,v 1.32 2009/08/08 15:52:09 wiz Exp $
 
-SHA1 (bzr-1.16.1.tar.gz) = 9118b3b74d37eab775d80e3060d63224399bcb02
-RMD160 (bzr-1.16.1.tar.gz) = 347ae85e08e15b0e4e3583c3157a7e82439b2bcc
-Size (bzr-1.16.1.tar.gz) = 5080912 bytes
+SHA1 (bzr-1.17.tar.gz) = 32dce4d48768c32c4a62595249fe37534179a116
+RMD160 (bzr-1.17.tar.gz) = 422d4c5b47b003fe35491ce01ea55bae2f28f004
+Size (bzr-1.17.tar.gz) = 5913890 bytes
 SHA1 (patch-aa) = 8eda90885b3127525330cd3432538fb2b4df98c1
-SHA1 (patch-ab) = 2213a002f9bc0f5baba0554b6b375becf4d98d9c
+SHA1 (patch-ab) = 042761dede5533cefbfa25ba548c3bb13236dce5
diff --git a/devel/bzr/patches/patch-ab b/devel/bzr/patches/patch-ab
index f84792187f9..3e9e69e5b52 100644
--- a/devel/bzr/patches/patch-ab
+++ b/devel/bzr/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.5 2007/10/27 11:46:43 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2009/08/08 15:52:09 wiz Exp $
 
---- setup.py.orig	2007-09-26 02:47:54.000000000 +0000
-+++ setup.py
-@@ -320,7 +320,7 @@ else:
-     DATA_FILES = []
+--- setup.py.orig	2009-08-06 10:40:13.000000000 +0200
++++ setup.py	2009-08-06 10:41:02.000000000 +0200
+@@ -659,7 +659,7 @@
      if not 'bdist_egg' in sys.argv:
-         # generate and install bzr.1 only with plain install, not easy_install one
+         # generate and install bzr.1 only with plain install, not the
+         # easy_install one
 -        DATA_FILES = [('man/man1', ['bzr.1'])]
 +        DATA_FILES = [(os.getenv('PKGMANDIR', 'man') + '/man1', ['bzr.1'])]