Update to 2.4.2 from wip by Oleksander Kozhachuk.

Tested on NetBSD current, Linux and Solaris-10.

6 files changed, 349 insertions, 168 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index aaccfaa2c88..90117298cf2 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.52 2011/11/02 19:31:13 jakllsch Exp $
+# $NetBSD: Makefile,v 1.53 2011/11/27 13:31:23 cheusov Exp $
 
 DISTNAME=		bzr-${VER}
 CATEGORIES=		devel scm
-MASTER_SITES=		http://launchpad.net/bzr/2.1/${VER}/+download/
-VER=			2.1.1
+MASTER_SITES=		http://launchpad.net/bzr/${VER:R}/${VER}/+download/
+VER=			2.4.2
 
-MAINTAINER=		jan.m.danielsson@gmail.com
+MAINTAINER=		ddeus.pkgsrc@mailnull.com
 HOMEPAGE=		http://bazaar-vcs.org/
 COMMENT=		Bazaar open source distributed version control system
 LICENSE=		gnu-gpl-v2
 
 DEPENDS+=		${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
 BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0:../../textproc/py-docutils
+BUILD_DEPENDS+=		${PYPKGPREFIX}-pyrex>=0:../../lang/py-pyrex
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -19,9 +20,14 @@ USE_TOOLS+=		gmake
 
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=	27 31
+# Only this python versions are supported, see:
+# http://doc.bazaar.canonical.com/bzr.dev/en/whats-new/whats-new-in-2.4.html
+PYTHON_VERSIONS_ACCEPTED=	27 26
 
 PYTHON_PATCH_SCRIPTS=		bzr bzrlib/weave.py
+PYTHON_PATCH_SCRIPTS+=		bzrlib/patiencediff.py bzrlib/_patiencediff_py.py
+PYTHON_PATCH_SCRIPTS+=		bzrlib/plugins/bash_completion/bashcomp.py
+PYTHON_PATCH_SCRIPTS+=		bzrlib/tests/ssl_certs/create_ssls.py
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index 1006592a87b..1a19656aa5c 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2010/12/04 01:21:06 gdt Exp $
+@comment $NetBSD: PLIST,v 1.34 2011/11/27 13:31:23 cheusov Exp $
 bin/bzr
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
@@ -65,87 +65,6 @@ ${PYSITELIB}/bzrlib/api.pyo
 ${PYSITELIB}/bzrlib/atomicfile.py
 ${PYSITELIB}/bzrlib/atomicfile.pyc
 ${PYSITELIB}/bzrlib/atomicfile.pyo
-${PYSITELIB}/bzrlib/benchmarks/__init__.py
-${PYSITELIB}/bzrlib/benchmarks/__init__.pyc
-${PYSITELIB}/bzrlib/benchmarks/__init__.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_add.py
-${PYSITELIB}/bzrlib/benchmarks/bench_add.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_add.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_bench.py
-${PYSITELIB}/bzrlib/benchmarks/bench_bench.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_bench.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_bundle.py
-${PYSITELIB}/bzrlib/benchmarks/bench_bundle.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_bundle.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_cache_utf8.py
-${PYSITELIB}/bzrlib/benchmarks/bench_cache_utf8.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_cache_utf8.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_checkout.py
-${PYSITELIB}/bzrlib/benchmarks/bench_checkout.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_checkout.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_commit.py
-${PYSITELIB}/bzrlib/benchmarks/bench_commit.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_commit.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_dirstate.py
-${PYSITELIB}/bzrlib/benchmarks/bench_dirstate.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_dirstate.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_info.py
-${PYSITELIB}/bzrlib/benchmarks/bench_info.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_info.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_inventory.py
-${PYSITELIB}/bzrlib/benchmarks/bench_inventory.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_inventory.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_knit.py
-${PYSITELIB}/bzrlib/benchmarks/bench_knit.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_knit.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_log.py
-${PYSITELIB}/bzrlib/benchmarks/bench_log.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_log.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_osutils.py
-${PYSITELIB}/bzrlib/benchmarks/bench_osutils.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_osutils.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_pack.py
-${PYSITELIB}/bzrlib/benchmarks/bench_pack.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_pack.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_rocks.py
-${PYSITELIB}/bzrlib/benchmarks/bench_rocks.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_rocks.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_sftp.py
-${PYSITELIB}/bzrlib/benchmarks/bench_sftp.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_sftp.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_startup.py
-${PYSITELIB}/bzrlib/benchmarks/bench_startup.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_startup.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_status.py
-${PYSITELIB}/bzrlib/benchmarks/bench_status.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_status.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_tags.py
-${PYSITELIB}/bzrlib/benchmarks/bench_tags.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_tags.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_transform.py
-${PYSITELIB}/bzrlib/benchmarks/bench_transform.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_transform.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_workingtree.py
-${PYSITELIB}/bzrlib/benchmarks/bench_workingtree.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_workingtree.pyo
-${PYSITELIB}/bzrlib/benchmarks/bench_xml.py
-${PYSITELIB}/bzrlib/benchmarks/bench_xml.pyc
-${PYSITELIB}/bzrlib/benchmarks/bench_xml.pyo
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/__init__.py
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/__init__.pyc
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/__init__.pyo
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/heavily_merged.py
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/heavily_merged.pyc
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/heavily_merged.pyo
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/kernel_like.py
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/kernel_like.pyc
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/kernel_like.pyo
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/many_commit.py
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/many_commit.pyc
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/many_commit.pyo
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/simple_many_commit.py
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/simple_many_commit.pyc
-${PYSITELIB}/bzrlib/benchmarks/tree_creator/simple_many_commit.pyo
 ${PYSITELIB}/bzrlib/bencode.py
 ${PYSITELIB}/bzrlib/bencode.pyc
 ${PYSITELIB}/bzrlib/bencode.pyo
@@ -200,6 +119,9 @@ ${PYSITELIB}/bzrlib/bzrdir.pyo
 ${PYSITELIB}/bzrlib/cache_utf8.py
 ${PYSITELIB}/bzrlib/cache_utf8.pyc
 ${PYSITELIB}/bzrlib/cache_utf8.pyo
+${PYSITELIB}/bzrlib/cethread.py
+${PYSITELIB}/bzrlib/cethread.pyc
+${PYSITELIB}/bzrlib/cethread.pyo
 ${PYSITELIB}/bzrlib/check.py
 ${PYSITELIB}/bzrlib/check.pyc
 ${PYSITELIB}/bzrlib/check.pyo
@@ -218,21 +140,33 @@ ${PYSITELIB}/bzrlib/clean_tree.pyo
 ${PYSITELIB}/bzrlib/cleanup.py
 ${PYSITELIB}/bzrlib/cleanup.pyc
 ${PYSITELIB}/bzrlib/cleanup.pyo
+${PYSITELIB}/bzrlib/cmd_test_script.py
+${PYSITELIB}/bzrlib/cmd_test_script.pyc
+${PYSITELIB}/bzrlib/cmd_test_script.pyo
 ${PYSITELIB}/bzrlib/cmd_version_info.py
 ${PYSITELIB}/bzrlib/cmd_version_info.pyc
 ${PYSITELIB}/bzrlib/cmd_version_info.pyo
+${PYSITELIB}/bzrlib/cmdline.py
+${PYSITELIB}/bzrlib/cmdline.pyc
+${PYSITELIB}/bzrlib/cmdline.pyo
 ${PYSITELIB}/bzrlib/commands.py
 ${PYSITELIB}/bzrlib/commands.pyc
 ${PYSITELIB}/bzrlib/commands.pyo
 ${PYSITELIB}/bzrlib/commit.py
 ${PYSITELIB}/bzrlib/commit.pyc
 ${PYSITELIB}/bzrlib/commit.pyo
+${PYSITELIB}/bzrlib/commit_signature_commands.py
+${PYSITELIB}/bzrlib/commit_signature_commands.pyc
+${PYSITELIB}/bzrlib/commit_signature_commands.pyo
 ${PYSITELIB}/bzrlib/config.py
 ${PYSITELIB}/bzrlib/config.pyc
 ${PYSITELIB}/bzrlib/config.pyo
 ${PYSITELIB}/bzrlib/conflicts.py
 ${PYSITELIB}/bzrlib/conflicts.pyc
 ${PYSITELIB}/bzrlib/conflicts.pyo
+${PYSITELIB}/bzrlib/controldir.py
+${PYSITELIB}/bzrlib/controldir.pyc
+${PYSITELIB}/bzrlib/controldir.pyo
 ${PYSITELIB}/bzrlib/counted_lock.py
 ${PYSITELIB}/bzrlib/counted_lock.pyc
 ${PYSITELIB}/bzrlib/counted_lock.pyo
@@ -248,9 +182,6 @@ ${PYSITELIB}/bzrlib/decorators.pyo
 ${PYSITELIB}/bzrlib/delta.py
 ${PYSITELIB}/bzrlib/delta.pyc
 ${PYSITELIB}/bzrlib/delta.pyo
-${PYSITELIB}/bzrlib/deprecated_graph.py
-${PYSITELIB}/bzrlib/deprecated_graph.pyc
-${PYSITELIB}/bzrlib/deprecated_graph.pyo
 ${PYSITELIB}/bzrlib/diff.py
 ${PYSITELIB}/bzrlib/diff.pyc
 ${PYSITELIB}/bzrlib/diff.pyo
@@ -280,9 +211,21 @@ ${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/doc_generate/sphinx_conf.py
-${PYSITELIB}/bzrlib/doc_generate/sphinx_conf.pyc
-${PYSITELIB}/bzrlib/doc_generate/sphinx_conf.pyo
+${PYSITELIB}/bzrlib/doc_generate/builders/__init__.py
+${PYSITELIB}/bzrlib/doc_generate/builders/__init__.pyc
+${PYSITELIB}/bzrlib/doc_generate/builders/__init__.pyo
+${PYSITELIB}/bzrlib/doc_generate/builders/texinfo.py
+${PYSITELIB}/bzrlib/doc_generate/builders/texinfo.pyc
+${PYSITELIB}/bzrlib/doc_generate/builders/texinfo.pyo
+${PYSITELIB}/bzrlib/doc_generate/conf.py
+${PYSITELIB}/bzrlib/doc_generate/conf.pyc
+${PYSITELIB}/bzrlib/doc_generate/conf.pyo
+${PYSITELIB}/bzrlib/doc_generate/writers/__init__.py
+${PYSITELIB}/bzrlib/doc_generate/writers/__init__.pyc
+${PYSITELIB}/bzrlib/doc_generate/writers/__init__.pyo
+${PYSITELIB}/bzrlib/doc_generate/writers/texinfo.py
+${PYSITELIB}/bzrlib/doc_generate/writers/texinfo.pyc
+${PYSITELIB}/bzrlib/doc_generate/writers/texinfo.pyo
 ${PYSITELIB}/bzrlib/email_message.py
 ${PYSITELIB}/bzrlib/email_message.pyc
 ${PYSITELIB}/bzrlib/email_message.pyo
@@ -301,6 +244,9 @@ ${PYSITELIB}/bzrlib/export/tar_exporter.pyo
 ${PYSITELIB}/bzrlib/export/zip_exporter.py
 ${PYSITELIB}/bzrlib/export/zip_exporter.pyc
 ${PYSITELIB}/bzrlib/export/zip_exporter.pyo
+${PYSITELIB}/bzrlib/export_pot.py
+${PYSITELIB}/bzrlib/export_pot.pyc
+${PYSITELIB}/bzrlib/export_pot.pyo
 ${PYSITELIB}/bzrlib/externalcommand.py
 ${PYSITELIB}/bzrlib/externalcommand.pyc
 ${PYSITELIB}/bzrlib/externalcommand.pyo
@@ -357,6 +303,9 @@ ${PYSITELIB}/bzrlib/help_topics/en/rules.txt
 ${PYSITELIB}/bzrlib/hooks.py
 ${PYSITELIB}/bzrlib/hooks.pyc
 ${PYSITELIB}/bzrlib/hooks.pyo
+${PYSITELIB}/bzrlib/i18n.py
+${PYSITELIB}/bzrlib/i18n.pyc
+${PYSITELIB}/bzrlib/i18n.pyo
 ${PYSITELIB}/bzrlib/identitymap.py
 ${PYSITELIB}/bzrlib/identitymap.pyc
 ${PYSITELIB}/bzrlib/identitymap.pyo
@@ -396,6 +345,9 @@ ${PYSITELIB}/bzrlib/lazy_import.pyo
 ${PYSITELIB}/bzrlib/lazy_regex.py
 ${PYSITELIB}/bzrlib/lazy_regex.pyc
 ${PYSITELIB}/bzrlib/lazy_regex.pyo
+${PYSITELIB}/bzrlib/library_state.py
+${PYSITELIB}/bzrlib/library_state.pyc
+${PYSITELIB}/bzrlib/library_state.pyo
 ${PYSITELIB}/bzrlib/lock.py
 ${PYSITELIB}/bzrlib/lock.pyc
 ${PYSITELIB}/bzrlib/lock.pyo
@@ -429,6 +381,9 @@ ${PYSITELIB}/bzrlib/merge3.pyo
 ${PYSITELIB}/bzrlib/merge_directive.py
 ${PYSITELIB}/bzrlib/merge_directive.pyc
 ${PYSITELIB}/bzrlib/merge_directive.pyo
+${PYSITELIB}/bzrlib/mergetools.py
+${PYSITELIB}/bzrlib/mergetools.pyc
+${PYSITELIB}/bzrlib/mergetools.pyo
 ${PYSITELIB}/bzrlib/missing.py
 ${PYSITELIB}/bzrlib/missing.pyc
 ${PYSITELIB}/bzrlib/missing.pyo
@@ -465,6 +420,30 @@ ${PYSITELIB}/bzrlib/plugin.pyo
 ${PYSITELIB}/bzrlib/plugins/__init__.py
 ${PYSITELIB}/bzrlib/plugins/__init__.pyc
 ${PYSITELIB}/bzrlib/plugins/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/bash_completion/__init__.py
+${PYSITELIB}/bzrlib/plugins/bash_completion/__init__.pyc
+${PYSITELIB}/bzrlib/plugins/bash_completion/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/bash_completion/bashcomp.py
+${PYSITELIB}/bzrlib/plugins/bash_completion/bashcomp.pyc
+${PYSITELIB}/bzrlib/plugins/bash_completion/bashcomp.pyo
+${PYSITELIB}/bzrlib/plugins/bash_completion/tests/__init__.py
+${PYSITELIB}/bzrlib/plugins/bash_completion/tests/__init__.pyc
+${PYSITELIB}/bzrlib/plugins/bash_completion/tests/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/bash_completion/tests/test_bashcomp.py
+${PYSITELIB}/bzrlib/plugins/bash_completion/tests/test_bashcomp.pyc
+${PYSITELIB}/bzrlib/plugins/bash_completion/tests/test_bashcomp.pyo
+${PYSITELIB}/bzrlib/plugins/changelog_merge/__init__.py
+${PYSITELIB}/bzrlib/plugins/changelog_merge/__init__.pyc
+${PYSITELIB}/bzrlib/plugins/changelog_merge/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/changelog_merge/changelog_merge.py
+${PYSITELIB}/bzrlib/plugins/changelog_merge/changelog_merge.pyc
+${PYSITELIB}/bzrlib/plugins/changelog_merge/changelog_merge.pyo
+${PYSITELIB}/bzrlib/plugins/changelog_merge/tests/__init__.py
+${PYSITELIB}/bzrlib/plugins/changelog_merge/tests/__init__.pyc
+${PYSITELIB}/bzrlib/plugins/changelog_merge/tests/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py
+${PYSITELIB}/bzrlib/plugins/changelog_merge/tests/test_changelog_merge.pyc
+${PYSITELIB}/bzrlib/plugins/changelog_merge/tests/test_changelog_merge.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/__init__.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/__init__.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/__init__.pyo
@@ -474,9 +453,15 @@ ${PYSITELIB}/bzrlib/plugins/launchpad/account.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/lp_api.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/lp_api.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/lp_api.pyo
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_api_lite.py
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_api_lite.pyc
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_api_lite.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/lp_directory.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/lp_directory.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/lp_directory.pyo
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_propose.py
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_propose.pyc
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_propose.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/lp_registration.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/lp_registration.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/lp_registration.pyo
@@ -486,6 +471,9 @@ ${PYSITELIB}/bzrlib/plugins/launchpad/test_account.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_api.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_api.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_api.pyo
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_api_lite.py
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_api_lite.pyc
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_api_lite.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
@@ -525,18 +513,51 @@ ${PYSITELIB}/bzrlib/plugins/news_merge/tests/__init__.pyo
 ${PYSITELIB}/bzrlib/plugins/news_merge/tests/test_news_merge.py
 ${PYSITELIB}/bzrlib/plugins/news_merge/tests/test_news_merge.pyc
 ${PYSITELIB}/bzrlib/plugins/news_merge/tests/test_news_merge.pyo
+${PYSITELIB}/bzrlib/plugins/weave_fmt/__init__.py
+${PYSITELIB}/bzrlib/plugins/weave_fmt/__init__.pyc
+${PYSITELIB}/bzrlib/plugins/weave_fmt/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/weave_fmt/branch.py
+${PYSITELIB}/bzrlib/plugins/weave_fmt/branch.pyc
+${PYSITELIB}/bzrlib/plugins/weave_fmt/branch.pyo
+${PYSITELIB}/bzrlib/plugins/weave_fmt/bzrdir.py
+${PYSITELIB}/bzrlib/plugins/weave_fmt/bzrdir.pyc
+${PYSITELIB}/bzrlib/plugins/weave_fmt/bzrdir.pyo
+${PYSITELIB}/bzrlib/plugins/weave_fmt/repository.py
+${PYSITELIB}/bzrlib/plugins/weave_fmt/repository.pyc
+${PYSITELIB}/bzrlib/plugins/weave_fmt/repository.pyo
+${PYSITELIB}/bzrlib/plugins/weave_fmt/test_bzrdir.py
+${PYSITELIB}/bzrlib/plugins/weave_fmt/test_bzrdir.pyc
+${PYSITELIB}/bzrlib/plugins/weave_fmt/test_bzrdir.pyo
+${PYSITELIB}/bzrlib/plugins/weave_fmt/test_repository.py
+${PYSITELIB}/bzrlib/plugins/weave_fmt/test_repository.pyc
+${PYSITELIB}/bzrlib/plugins/weave_fmt/test_repository.pyo
+${PYSITELIB}/bzrlib/plugins/weave_fmt/test_workingtree.py
+${PYSITELIB}/bzrlib/plugins/weave_fmt/test_workingtree.pyc
+${PYSITELIB}/bzrlib/plugins/weave_fmt/test_workingtree.pyo
+${PYSITELIB}/bzrlib/plugins/weave_fmt/workingtree.py
+${PYSITELIB}/bzrlib/plugins/weave_fmt/workingtree.pyc
+${PYSITELIB}/bzrlib/plugins/weave_fmt/workingtree.pyo
+${PYSITELIB}/bzrlib/plugins/weave_fmt/xml4.py
+${PYSITELIB}/bzrlib/plugins/weave_fmt/xml4.pyc
+${PYSITELIB}/bzrlib/plugins/weave_fmt/xml4.pyo
 ${PYSITELIB}/bzrlib/progress.py
 ${PYSITELIB}/bzrlib/progress.pyc
 ${PYSITELIB}/bzrlib/progress.pyo
 ${PYSITELIB}/bzrlib/push.py
 ${PYSITELIB}/bzrlib/push.pyc
 ${PYSITELIB}/bzrlib/push.pyo
+${PYSITELIB}/bzrlib/pyutils.py
+${PYSITELIB}/bzrlib/pyutils.pyc
+${PYSITELIB}/bzrlib/pyutils.pyo
 ${PYSITELIB}/bzrlib/reconcile.py
 ${PYSITELIB}/bzrlib/reconcile.pyc
 ${PYSITELIB}/bzrlib/reconcile.pyo
 ${PYSITELIB}/bzrlib/reconfigure.py
 ${PYSITELIB}/bzrlib/reconfigure.pyc
 ${PYSITELIB}/bzrlib/reconfigure.pyo
+${PYSITELIB}/bzrlib/recordcounter.py
+${PYSITELIB}/bzrlib/recordcounter.pyc
+${PYSITELIB}/bzrlib/recordcounter.pyo
 ${PYSITELIB}/bzrlib/registry.py
 ${PYSITELIB}/bzrlib/registry.pyc
 ${PYSITELIB}/bzrlib/registry.pyo
@@ -552,15 +573,15 @@ ${PYSITELIB}/bzrlib/repofmt/__init__.pyo
 ${PYSITELIB}/bzrlib/repofmt/groupcompress_repo.py
 ${PYSITELIB}/bzrlib/repofmt/groupcompress_repo.pyc
 ${PYSITELIB}/bzrlib/repofmt/groupcompress_repo.pyo
+${PYSITELIB}/bzrlib/repofmt/knitpack_repo.py
+${PYSITELIB}/bzrlib/repofmt/knitpack_repo.pyc
+${PYSITELIB}/bzrlib/repofmt/knitpack_repo.pyo
 ${PYSITELIB}/bzrlib/repofmt/knitrepo.py
 ${PYSITELIB}/bzrlib/repofmt/knitrepo.pyc
 ${PYSITELIB}/bzrlib/repofmt/knitrepo.pyo
 ${PYSITELIB}/bzrlib/repofmt/pack_repo.py
 ${PYSITELIB}/bzrlib/repofmt/pack_repo.pyc
 ${PYSITELIB}/bzrlib/repofmt/pack_repo.pyo
-${PYSITELIB}/bzrlib/repofmt/weaverepo.py
-${PYSITELIB}/bzrlib/repofmt/weaverepo.pyc
-${PYSITELIB}/bzrlib/repofmt/weaverepo.pyo
 ${PYSITELIB}/bzrlib/repository.py
 ${PYSITELIB}/bzrlib/repository.pyc
 ${PYSITELIB}/bzrlib/repository.pyo
@@ -594,9 +615,6 @@ ${PYSITELIB}/bzrlib/shelf_ui.pyo
 ${PYSITELIB}/bzrlib/shellcomplete.py
 ${PYSITELIB}/bzrlib/shellcomplete.pyc
 ${PYSITELIB}/bzrlib/shellcomplete.pyo
-${PYSITELIB}/bzrlib/sign_my_commits.py
-${PYSITELIB}/bzrlib/sign_my_commits.pyc
-${PYSITELIB}/bzrlib/sign_my_commits.pyo
 ${PYSITELIB}/bzrlib/smart/__init__.py
 ${PYSITELIB}/bzrlib/smart/__init__.pyc
 ${PYSITELIB}/bzrlib/smart/__init__.pyo
@@ -705,9 +723,6 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_branch.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.pyo
-${PYSITELIB}/bzrlib/tests/blackbox/test_breakin.py
-${PYSITELIB}/bzrlib/tests/blackbox/test_breakin.pyc
-${PYSITELIB}/bzrlib/tests/blackbox/test_breakin.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_bundle_info.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_bundle_info.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_bundle_info.pyo
@@ -732,12 +747,18 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_command_encoding.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_commit.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_commit.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_commit.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_config.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_config.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_config.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_conflicts.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_conflicts.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_conflicts.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_debug.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_debug.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_debug.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_deleted.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_deleted.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_deleted.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_diff.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_diff.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_diff.pyo
@@ -795,6 +816,9 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_log.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_logformats.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_logformats.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_logformats.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_lookup_revision.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_lookup_revision.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_lookup_revision.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_ls.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_ls.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_ls.pyo
@@ -846,6 +870,9 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_reconfigure.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_reference.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_reference.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_reference.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_remember_option.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_remember_option.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_remember_option.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_remerge.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_remerge.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_remerge.pyo
@@ -855,6 +882,12 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_remove.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_remove_tree.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_remove_tree.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_remove_tree.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_repair_workingtree.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_repair_workingtree.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_repair_workingtree.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_resolve.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_resolve.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_resolve.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_revert.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_revert.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_revert.pyo
@@ -867,6 +900,12 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_revision_info.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_revno.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_revno.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_revno.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_rmbranch.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_rmbranch.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_rmbranch.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_script.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_script.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_script.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_selftest.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_selftest.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_selftest.pyo
@@ -963,9 +1002,27 @@ ${PYSITELIB}/bzrlib/tests/commands/test_pull.pyo
 ${PYSITELIB}/bzrlib/tests/commands/test_push.py
 ${PYSITELIB}/bzrlib/tests/commands/test_push.pyc
 ${PYSITELIB}/bzrlib/tests/commands/test_push.pyo
+${PYSITELIB}/bzrlib/tests/commands/test_revert.py
+${PYSITELIB}/bzrlib/tests/commands/test_revert.pyc
+${PYSITELIB}/bzrlib/tests/commands/test_revert.pyo
 ${PYSITELIB}/bzrlib/tests/commands/test_update.py
 ${PYSITELIB}/bzrlib/tests/commands/test_update.pyc
 ${PYSITELIB}/bzrlib/tests/commands/test_update.pyo
+${PYSITELIB}/bzrlib/tests/doc_generate/__init__.py
+${PYSITELIB}/bzrlib/tests/doc_generate/__init__.pyc
+${PYSITELIB}/bzrlib/tests/doc_generate/__init__.pyo
+${PYSITELIB}/bzrlib/tests/doc_generate/builders/__init__.py
+${PYSITELIB}/bzrlib/tests/doc_generate/builders/__init__.pyc
+${PYSITELIB}/bzrlib/tests/doc_generate/builders/__init__.pyo
+${PYSITELIB}/bzrlib/tests/doc_generate/builders/test_texinfo.py
+${PYSITELIB}/bzrlib/tests/doc_generate/builders/test_texinfo.pyc
+${PYSITELIB}/bzrlib/tests/doc_generate/builders/test_texinfo.pyo
+${PYSITELIB}/bzrlib/tests/doc_generate/writers/__init__.py
+${PYSITELIB}/bzrlib/tests/doc_generate/writers/__init__.pyc
+${PYSITELIB}/bzrlib/tests/doc_generate/writers/__init__.pyo
+${PYSITELIB}/bzrlib/tests/doc_generate/writers/test_texinfo.py
+${PYSITELIB}/bzrlib/tests/doc_generate/writers/test_texinfo.pyc
+${PYSITELIB}/bzrlib/tests/doc_generate/writers/test_texinfo.pyo
 ${PYSITELIB}/bzrlib/tests/fake_command.py
 ${PYSITELIB}/bzrlib/tests/fake_command.pyc
 ${PYSITELIB}/bzrlib/tests/fake_command.pyo
@@ -975,6 +1032,9 @@ ${PYSITELIB}/bzrlib/tests/features.pyo
 ${PYSITELIB}/bzrlib/tests/file_utils.py
 ${PYSITELIB}/bzrlib/tests/file_utils.pyc
 ${PYSITELIB}/bzrlib/tests/file_utils.pyo
+${PYSITELIB}/bzrlib/tests/fixtures.py
+${PYSITELIB}/bzrlib/tests/fixtures.pyc
+${PYSITELIB}/bzrlib/tests/fixtures.pyo
 ${PYSITELIB}/bzrlib/tests/ftp_server/__init__.py
 ${PYSITELIB}/bzrlib/tests/ftp_server/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/ftp_server/__init__.pyo
@@ -996,6 +1056,9 @@ ${PYSITELIB}/bzrlib/tests/https_server.pyo
 ${PYSITELIB}/bzrlib/tests/lock_helpers.py
 ${PYSITELIB}/bzrlib/tests/lock_helpers.pyc
 ${PYSITELIB}/bzrlib/tests/lock_helpers.pyo
+${PYSITELIB}/bzrlib/tests/matchers.py
+${PYSITELIB}/bzrlib/tests/matchers.pyc
+${PYSITELIB}/bzrlib/tests/matchers.pyo
 ${PYSITELIB}/bzrlib/tests/per_branch/__init__.py
 ${PYSITELIB}/bzrlib/tests/per_branch/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/per_branch/__init__.pyo
@@ -1014,6 +1077,9 @@ ${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_config.py
+${PYSITELIB}/bzrlib/tests/per_branch/test_config.pyc
+${PYSITELIB}/bzrlib/tests/per_branch/test_config.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
@@ -1086,9 +1152,27 @@ ${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_controldir/__init__.py
+${PYSITELIB}/bzrlib/tests/per_controldir/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_controldir/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_controldir/test_controldir.py
+${PYSITELIB}/bzrlib/tests/per_controldir/test_controldir.pyc
+${PYSITELIB}/bzrlib/tests/per_controldir/test_controldir.pyo
+${PYSITELIB}/bzrlib/tests/per_controldir/test_format.py
+${PYSITELIB}/bzrlib/tests/per_controldir/test_format.pyc
+${PYSITELIB}/bzrlib/tests/per_controldir/test_format.pyo
+${PYSITELIB}/bzrlib/tests/per_controldir/test_push.py
+${PYSITELIB}/bzrlib/tests/per_controldir/test_push.pyc
+${PYSITELIB}/bzrlib/tests/per_controldir/test_push.pyo
+${PYSITELIB}/bzrlib/tests/per_controldir_colo/__init__.py
+${PYSITELIB}/bzrlib/tests/per_controldir_colo/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_controldir_colo/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_controldir_colo/test_supported.py
+${PYSITELIB}/bzrlib/tests/per_controldir_colo/test_supported.pyc
+${PYSITELIB}/bzrlib/tests/per_controldir_colo/test_supported.pyo
+${PYSITELIB}/bzrlib/tests/per_controldir_colo/test_unsupported.py
+${PYSITELIB}/bzrlib/tests/per_controldir_colo/test_unsupported.pyc
+${PYSITELIB}/bzrlib/tests/per_controldir_colo/test_unsupported.pyo
 ${PYSITELIB}/bzrlib/tests/per_foreign_vcs/__init__.py
 ${PYSITELIB}/bzrlib/tests/per_foreign_vcs/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/per_foreign_vcs/__init__.pyo
@@ -1101,15 +1185,21 @@ ${PYSITELIB}/bzrlib/tests/per_foreign_vcs/test_repository.pyo
 ${PYSITELIB}/bzrlib/tests/per_interbranch/__init__.py
 ${PYSITELIB}/bzrlib/tests/per_interbranch/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/per_interbranch/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_interbranch/test_copy_content_into.py
+${PYSITELIB}/bzrlib/tests/per_interbranch/test_copy_content_into.pyc
+${PYSITELIB}/bzrlib/tests/per_interbranch/test_copy_content_into.pyo
+${PYSITELIB}/bzrlib/tests/per_interbranch/test_fetch.py
+${PYSITELIB}/bzrlib/tests/per_interbranch/test_fetch.pyc
+${PYSITELIB}/bzrlib/tests/per_interbranch/test_fetch.pyo
+${PYSITELIB}/bzrlib/tests/per_interbranch/test_get.py
+${PYSITELIB}/bzrlib/tests/per_interbranch/test_get.pyc
+${PYSITELIB}/bzrlib/tests/per_interbranch/test_get.pyo
 ${PYSITELIB}/bzrlib/tests/per_interbranch/test_pull.py
 ${PYSITELIB}/bzrlib/tests/per_interbranch/test_pull.pyc
 ${PYSITELIB}/bzrlib/tests/per_interbranch/test_pull.pyo
 ${PYSITELIB}/bzrlib/tests/per_interbranch/test_push.py
 ${PYSITELIB}/bzrlib/tests/per_interbranch/test_push.pyc
 ${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
@@ -1149,39 +1239,27 @@ ${PYSITELIB}/bzrlib/tests/per_pack_repository.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/__init__.py
 ${PYSITELIB}/bzrlib/tests/per_repository/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/__init__.pyo
-${PYSITELIB}/bzrlib/tests/per_repository/helpers.py
-${PYSITELIB}/bzrlib/tests/per_repository/helpers.pyc
-${PYSITELIB}/bzrlib/tests/per_repository/helpers.pyo
-${PYSITELIB}/bzrlib/tests/per_repository/test__generate_text_key_index.py
-${PYSITELIB}/bzrlib/tests/per_repository/test__generate_text_key_index.pyc
-${PYSITELIB}/bzrlib/tests/per_repository/test__generate_text_key_index.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_add_fallback_repository.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_add_fallback_repository.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_add_fallback_repository.pyo
-${PYSITELIB}/bzrlib/tests/per_repository/test_add_inventory_by_delta.py
-${PYSITELIB}/bzrlib/tests/per_repository/test_add_inventory_by_delta.pyc
-${PYSITELIB}/bzrlib/tests/per_repository/test_add_inventory_by_delta.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_break_lock.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_break_lock.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_break_lock.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_check.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_check.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_check.pyo
-${PYSITELIB}/bzrlib/tests/per_repository/test_check_reconcile.py
-${PYSITELIB}/bzrlib/tests/per_repository/test_check_reconcile.pyc
-${PYSITELIB}/bzrlib/tests/per_repository/test_check_reconcile.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_commit_builder.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_commit_builder.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_commit_builder.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_fetch.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_fetch.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_fetch.pyo
+${PYSITELIB}/bzrlib/tests/per_repository/test_file_graph.py
+${PYSITELIB}/bzrlib/tests/per_repository/test_file_graph.pyc
+${PYSITELIB}/bzrlib/tests/per_repository/test_file_graph.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_fileid_involved.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_fileid_involved.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_fileid_involved.pyo
-${PYSITELIB}/bzrlib/tests/per_repository/test_find_text_key_references.py
-${PYSITELIB}/bzrlib/tests/per_repository/test_find_text_key_references.pyc
-${PYSITELIB}/bzrlib/tests/per_repository/test_find_text_key_references.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_get_parent_map.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_get_parent_map.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_get_parent_map.pyo
@@ -1191,12 +1269,12 @@ ${PYSITELIB}/bzrlib/tests/per_repository/test_has_revisions.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_has_same_location.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_has_same_location.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_has_same_location.pyo
-${PYSITELIB}/bzrlib/tests/per_repository/test_is_write_locked.py
-${PYSITELIB}/bzrlib/tests/per_repository/test_is_write_locked.pyc
-${PYSITELIB}/bzrlib/tests/per_repository/test_is_write_locked.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_iter_reverse_revision_history.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_iter_reverse_revision_history.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_iter_reverse_revision_history.pyo
+${PYSITELIB}/bzrlib/tests/per_repository/test_locking.py
+${PYSITELIB}/bzrlib/tests/per_repository/test_locking.pyc
+${PYSITELIB}/bzrlib/tests/per_repository/test_locking.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository/test_merge_directive.py
 ${PYSITELIB}/bzrlib/tests/per_repository/test_merge_directive.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository/test_merge_directive.pyo
@@ -1233,6 +1311,9 @@ ${PYSITELIB}/bzrlib/tests/per_repository_chk/test_unsupported.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/__init__.py
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test__make_parents_provider.py
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test__make_parents_provider.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test__make_parents_provider.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_add_inventory.py
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_add_inventory.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_add_inventory.pyo
@@ -1251,6 +1332,9 @@ ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_break_lock.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_check.py
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_check.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_check.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test_commit_with_stacking.py
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test_commit_with_stacking.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test_commit_with_stacking.pyo
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_default_stacking.py
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_default_stacking.pyc
 ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_default_stacking.pyo
@@ -1263,12 +1347,48 @@ ${PYSITELIB}/bzrlib/tests/per_repository_reference/test_get_record_stream.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_graph.py
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test_graph.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_reference/test_graph.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_repository_vf/__init__.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/helpers.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/helpers.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/helpers.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test__generate_text_key_index.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test__generate_text_key_index.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_check.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_check.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_check.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_check_reconcile.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_check_reconcile.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_check_reconcile.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_fetch.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_fetch.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_fetch.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_find_text_key_references.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_find_text_key_references.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_find_text_key_references.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_reconcile.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_reconcile.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_reconcile.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_repository.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_repository.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_repository.pyo
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_write_group.py
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_write_group.pyc
+${PYSITELIB}/bzrlib/tests/per_repository_vf/test_write_group.pyo
 ${PYSITELIB}/bzrlib/tests/per_transport.py
 ${PYSITELIB}/bzrlib/tests/per_transport.pyc
 ${PYSITELIB}/bzrlib/tests/per_transport.pyo
@@ -1278,6 +1398,9 @@ ${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_export.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_export.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_export.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
@@ -1293,12 +1416,18 @@ ${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_is_executable.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_is_executable.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_is_executable.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_locking.py
+${PYSITELIB}/bzrlib/tests/per_tree/test_locking.pyc
+${PYSITELIB}/bzrlib/tests/per_tree/test_locking.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
@@ -1347,6 +1476,9 @@ ${PYSITELIB}/bzrlib/tests/per_workingtree/test_changes_from.pyo
 ${PYSITELIB}/bzrlib/tests/per_workingtree/test_check.py
 ${PYSITELIB}/bzrlib/tests/per_workingtree/test_check.pyc
 ${PYSITELIB}/bzrlib/tests/per_workingtree/test_check.pyo
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_check_state.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_check_state.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_check_state.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
@@ -1425,6 +1557,9 @@ ${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_symlinks.py
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_symlinks.pyc
+${PYSITELIB}/bzrlib/tests/per_workingtree/test_symlinks.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
@@ -1440,12 +1575,16 @@ ${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/scenarios.py
+${PYSITELIB}/bzrlib/tests/scenarios.pyc
+${PYSITELIB}/bzrlib/tests/scenarios.pyo
 ${PYSITELIB}/bzrlib/tests/script.py
 ${PYSITELIB}/bzrlib/tests/script.pyc
 ${PYSITELIB}/bzrlib/tests/script.pyo
 ${PYSITELIB}/bzrlib/tests/ssl_certs/__init__.py
 ${PYSITELIB}/bzrlib/tests/ssl_certs/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/ssl_certs/__init__.pyo
+${PYSITELIB}/bzrlib/tests/ssl_certs/ca.crt
 ${PYSITELIB}/bzrlib/tests/ssl_certs/create_ssls.py
 ${PYSITELIB}/bzrlib/tests/ssl_certs/create_ssls.pyc
 ${PYSITELIB}/bzrlib/tests/ssl_certs/create_ssls.pyo
@@ -1461,6 +1600,9 @@ ${PYSITELIB}/bzrlib/tests/test__annotator.pyo
 ${PYSITELIB}/bzrlib/tests/test__bencode.py
 ${PYSITELIB}/bzrlib/tests/test__bencode.pyc
 ${PYSITELIB}/bzrlib/tests/test__bencode.pyo
+${PYSITELIB}/bzrlib/tests/test__btree_serializer.py
+${PYSITELIB}/bzrlib/tests/test__btree_serializer.pyc
+${PYSITELIB}/bzrlib/tests/test__btree_serializer.pyo
 ${PYSITELIB}/bzrlib/tests/test__chk_map.py
 ${PYSITELIB}/bzrlib/tests/test__chk_map.pyc
 ${PYSITELIB}/bzrlib/tests/test__chk_map.pyo
@@ -1527,6 +1669,9 @@ ${PYSITELIB}/bzrlib/tests/test_bzrdir.pyo
 ${PYSITELIB}/bzrlib/tests/test_cache_utf8.py
 ${PYSITELIB}/bzrlib/tests/test_cache_utf8.pyc
 ${PYSITELIB}/bzrlib/tests/test_cache_utf8.pyo
+${PYSITELIB}/bzrlib/tests/test_cethread.py
+${PYSITELIB}/bzrlib/tests/test_cethread.pyc
+${PYSITELIB}/bzrlib/tests/test_cethread.pyo
 ${PYSITELIB}/bzrlib/tests/test_chk_map.py
 ${PYSITELIB}/bzrlib/tests/test_chk_map.pyc
 ${PYSITELIB}/bzrlib/tests/test_chk_map.pyo
@@ -1542,6 +1687,9 @@ ${PYSITELIB}/bzrlib/tests/test_clean_tree.pyo
 ${PYSITELIB}/bzrlib/tests/test_cleanup.py
 ${PYSITELIB}/bzrlib/tests/test_cleanup.pyc
 ${PYSITELIB}/bzrlib/tests/test_cleanup.pyo
+${PYSITELIB}/bzrlib/tests/test_cmdline.py
+${PYSITELIB}/bzrlib/tests/test_cmdline.pyc
+${PYSITELIB}/bzrlib/tests/test_cmdline.pyo
 ${PYSITELIB}/bzrlib/tests/test_commands.py
 ${PYSITELIB}/bzrlib/tests/test_commands.pyc
 ${PYSITELIB}/bzrlib/tests/test_commands.pyo
@@ -1557,6 +1705,9 @@ ${PYSITELIB}/bzrlib/tests/test_config.pyo
 ${PYSITELIB}/bzrlib/tests/test_conflicts.py
 ${PYSITELIB}/bzrlib/tests/test_conflicts.pyc
 ${PYSITELIB}/bzrlib/tests/test_conflicts.pyo
+${PYSITELIB}/bzrlib/tests/test_controldir.py
+${PYSITELIB}/bzrlib/tests/test_controldir.pyc
+${PYSITELIB}/bzrlib/tests/test_controldir.pyo
 ${PYSITELIB}/bzrlib/tests/test_counted_lock.py
 ${PYSITELIB}/bzrlib/tests/test_counted_lock.pyc
 ${PYSITELIB}/bzrlib/tests/test_counted_lock.pyo
@@ -1572,9 +1723,6 @@ ${PYSITELIB}/bzrlib/tests/test_decorators.pyo
 ${PYSITELIB}/bzrlib/tests/test_delta.py
 ${PYSITELIB}/bzrlib/tests/test_delta.pyc
 ${PYSITELIB}/bzrlib/tests/test_delta.pyo
-${PYSITELIB}/bzrlib/tests/test_deprecated_graph.py
-${PYSITELIB}/bzrlib/tests/test_deprecated_graph.pyc
-${PYSITELIB}/bzrlib/tests/test_deprecated_graph.pyo
 ${PYSITELIB}/bzrlib/tests/test_diff.py
 ${PYSITELIB}/bzrlib/tests/test_diff.pyc
 ${PYSITELIB}/bzrlib/tests/test_diff.pyo
@@ -1596,6 +1744,9 @@ ${PYSITELIB}/bzrlib/tests/test_errors.pyo
 ${PYSITELIB}/bzrlib/tests/test_export.py
 ${PYSITELIB}/bzrlib/tests/test_export.pyc
 ${PYSITELIB}/bzrlib/tests/test_export.pyo
+${PYSITELIB}/bzrlib/tests/test_export_pot.py
+${PYSITELIB}/bzrlib/tests/test_export_pot.pyc
+${PYSITELIB}/bzrlib/tests/test_export_pot.pyo
 ${PYSITELIB}/bzrlib/tests/test_extract.py
 ${PYSITELIB}/bzrlib/tests/test_extract.pyc
 ${PYSITELIB}/bzrlib/tests/test_extract.pyo
@@ -1608,6 +1759,9 @@ ${PYSITELIB}/bzrlib/tests/test_fifo_cache.pyo
 ${PYSITELIB}/bzrlib/tests/test_filters.py
 ${PYSITELIB}/bzrlib/tests/test_filters.pyc
 ${PYSITELIB}/bzrlib/tests/test_filters.pyo
+${PYSITELIB}/bzrlib/tests/test_fixtures.py
+${PYSITELIB}/bzrlib/tests/test_fixtures.pyc
+${PYSITELIB}/bzrlib/tests/test_fixtures.pyo
 ${PYSITELIB}/bzrlib/tests/test_foreign.py
 ${PYSITELIB}/bzrlib/tests/test_foreign.pyc
 ${PYSITELIB}/bzrlib/tests/test_foreign.pyo
@@ -1650,12 +1804,18 @@ ${PYSITELIB}/bzrlib/tests/test_http_response.pyo
 ${PYSITELIB}/bzrlib/tests/test_https_ca_bundle.py
 ${PYSITELIB}/bzrlib/tests/test_https_ca_bundle.pyc
 ${PYSITELIB}/bzrlib/tests/test_https_ca_bundle.pyo
+${PYSITELIB}/bzrlib/tests/test_i18n.py
+${PYSITELIB}/bzrlib/tests/test_i18n.pyc
+${PYSITELIB}/bzrlib/tests/test_i18n.pyo
 ${PYSITELIB}/bzrlib/tests/test_identitymap.py
 ${PYSITELIB}/bzrlib/tests/test_identitymap.pyc
 ${PYSITELIB}/bzrlib/tests/test_identitymap.pyo
 ${PYSITELIB}/bzrlib/tests/test_ignores.py
 ${PYSITELIB}/bzrlib/tests/test_ignores.pyc
 ${PYSITELIB}/bzrlib/tests/test_ignores.pyo
+${PYSITELIB}/bzrlib/tests/test_import_tariff.py
+${PYSITELIB}/bzrlib/tests/test_import_tariff.pyc
+${PYSITELIB}/bzrlib/tests/test_import_tariff.pyo
 ${PYSITELIB}/bzrlib/tests/test_index.py
 ${PYSITELIB}/bzrlib/tests/test_index.pyc
 ${PYSITELIB}/bzrlib/tests/test_index.pyo
@@ -1677,6 +1837,9 @@ ${PYSITELIB}/bzrlib/tests/test_lazy_import.pyo
 ${PYSITELIB}/bzrlib/tests/test_lazy_regex.py
 ${PYSITELIB}/bzrlib/tests/test_lazy_regex.pyc
 ${PYSITELIB}/bzrlib/tests/test_lazy_regex.pyo
+${PYSITELIB}/bzrlib/tests/test_library_state.py
+${PYSITELIB}/bzrlib/tests/test_library_state.pyc
+${PYSITELIB}/bzrlib/tests/test_library_state.pyo
 ${PYSITELIB}/bzrlib/tests/test_lock.py
 ${PYSITELIB}/bzrlib/tests/test_lock.pyc
 ${PYSITELIB}/bzrlib/tests/test_lock.pyo
@@ -1698,6 +1861,9 @@ ${PYSITELIB}/bzrlib/tests/test_lsprof.pyo
 ${PYSITELIB}/bzrlib/tests/test_mail_client.py
 ${PYSITELIB}/bzrlib/tests/test_mail_client.pyc
 ${PYSITELIB}/bzrlib/tests/test_mail_client.pyo
+${PYSITELIB}/bzrlib/tests/test_matchers.py
+${PYSITELIB}/bzrlib/tests/test_matchers.pyc
+${PYSITELIB}/bzrlib/tests/test_matchers.pyo
 ${PYSITELIB}/bzrlib/tests/test_memorytree.py
 ${PYSITELIB}/bzrlib/tests/test_memorytree.pyc
 ${PYSITELIB}/bzrlib/tests/test_memorytree.pyo
@@ -1713,6 +1879,9 @@ ${PYSITELIB}/bzrlib/tests/test_merge_core.pyo
 ${PYSITELIB}/bzrlib/tests/test_merge_directive.py
 ${PYSITELIB}/bzrlib/tests/test_merge_directive.pyc
 ${PYSITELIB}/bzrlib/tests/test_merge_directive.pyo
+${PYSITELIB}/bzrlib/tests/test_mergetools.py
+${PYSITELIB}/bzrlib/tests/test_mergetools.pyc
+${PYSITELIB}/bzrlib/tests/test_mergetools.pyo
 ${PYSITELIB}/bzrlib/tests/test_missing.py
 ${PYSITELIB}/bzrlib/tests/test_missing.pyc
 ${PYSITELIB}/bzrlib/tests/test_missing.pyo
@@ -1780,6 +1949,9 @@ ${PYSITELIB}/bzrlib/tests/test_plugins.pyo
 ${PYSITELIB}/bzrlib/tests/test_progress.py
 ${PYSITELIB}/bzrlib/tests/test_progress.pyc
 ${PYSITELIB}/bzrlib/tests/test_progress.pyo
+${PYSITELIB}/bzrlib/tests/test_pyutils.py
+${PYSITELIB}/bzrlib/tests/test_pyutils.pyc
+${PYSITELIB}/bzrlib/tests/test_pyutils.pyo
 ${PYSITELIB}/bzrlib/tests/test_read_bundle.py
 ${PYSITELIB}/bzrlib/tests/test_read_bundle.pyc
 ${PYSITELIB}/bzrlib/tests/test_read_bundle.pyo
@@ -1822,6 +1994,9 @@ ${PYSITELIB}/bzrlib/tests/test_rules.pyo
 ${PYSITELIB}/bzrlib/tests/test_sampler.py
 ${PYSITELIB}/bzrlib/tests/test_sampler.pyc
 ${PYSITELIB}/bzrlib/tests/test_sampler.pyo
+${PYSITELIB}/bzrlib/tests/test_scenarios.py
+${PYSITELIB}/bzrlib/tests/test_scenarios.pyc
+${PYSITELIB}/bzrlib/tests/test_scenarios.pyo
 ${PYSITELIB}/bzrlib/tests/test_script.py
 ${PYSITELIB}/bzrlib/tests/test_script.pyc
 ${PYSITELIB}/bzrlib/tests/test_script.pyo
@@ -1831,6 +2006,9 @@ ${PYSITELIB}/bzrlib/tests/test_selftest.pyo
 ${PYSITELIB}/bzrlib/tests/test_serializer.py
 ${PYSITELIB}/bzrlib/tests/test_serializer.pyc
 ${PYSITELIB}/bzrlib/tests/test_serializer.pyo
+${PYSITELIB}/bzrlib/tests/test_server.py
+${PYSITELIB}/bzrlib/tests/test_server.pyc
+${PYSITELIB}/bzrlib/tests/test_server.pyo
 ${PYSITELIB}/bzrlib/tests/test_setup.py
 ${PYSITELIB}/bzrlib/tests/test_setup.pyc
 ${PYSITELIB}/bzrlib/tests/test_setup.pyo
@@ -1885,6 +2063,9 @@ ${PYSITELIB}/bzrlib/tests/test_symbol_versioning.pyo
 ${PYSITELIB}/bzrlib/tests/test_tag.py
 ${PYSITELIB}/bzrlib/tests/test_tag.pyc
 ${PYSITELIB}/bzrlib/tests/test_tag.pyo
+${PYSITELIB}/bzrlib/tests/test_test_server.py
+${PYSITELIB}/bzrlib/tests/test_test_server.pyc
+${PYSITELIB}/bzrlib/tests/test_test_server.pyo
 ${PYSITELIB}/bzrlib/tests/test_testament.py
 ${PYSITELIB}/bzrlib/tests/test_testament.pyc
 ${PYSITELIB}/bzrlib/tests/test_testament.pyo
@@ -1918,6 +2099,9 @@ ${PYSITELIB}/bzrlib/tests/test_tree.pyo
 ${PYSITELIB}/bzrlib/tests/test_treebuilder.py
 ${PYSITELIB}/bzrlib/tests/test_treebuilder.pyc
 ${PYSITELIB}/bzrlib/tests/test_treebuilder.pyo
+${PYSITELIB}/bzrlib/tests/test_treeshape.py
+${PYSITELIB}/bzrlib/tests/test_treeshape.pyc
+${PYSITELIB}/bzrlib/tests/test_treeshape.pyo
 ${PYSITELIB}/bzrlib/tests/test_tsort.py
 ${PYSITELIB}/bzrlib/tests/test_tsort.pyc
 ${PYSITELIB}/bzrlib/tests/test_tsort.pyo
@@ -1939,12 +2123,18 @@ ${PYSITELIB}/bzrlib/tests/test_upgrade_stacked.pyo
 ${PYSITELIB}/bzrlib/tests/test_urlutils.py
 ${PYSITELIB}/bzrlib/tests/test_urlutils.pyc
 ${PYSITELIB}/bzrlib/tests/test_urlutils.pyo
+${PYSITELIB}/bzrlib/tests/test_utextwrap.py
+${PYSITELIB}/bzrlib/tests/test_utextwrap.pyc
+${PYSITELIB}/bzrlib/tests/test_utextwrap.pyo
 ${PYSITELIB}/bzrlib/tests/test_version.py
 ${PYSITELIB}/bzrlib/tests/test_version.pyc
 ${PYSITELIB}/bzrlib/tests/test_version.pyo
 ${PYSITELIB}/bzrlib/tests/test_version_info.py
 ${PYSITELIB}/bzrlib/tests/test_version_info.pyc
 ${PYSITELIB}/bzrlib/tests/test_version_info.pyo
+${PYSITELIB}/bzrlib/tests/test_versionedfile.py
+${PYSITELIB}/bzrlib/tests/test_versionedfile.pyc
+${PYSITELIB}/bzrlib/tests/test_versionedfile.pyo
 ${PYSITELIB}/bzrlib/tests/test_weave.py
 ${PYSITELIB}/bzrlib/tests/test_weave.pyc
 ${PYSITELIB}/bzrlib/tests/test_weave.pyo
@@ -1966,6 +2156,9 @@ ${PYSITELIB}/bzrlib/tests/test_wsgi.pyo
 ${PYSITELIB}/bzrlib/tests/test_xml.py
 ${PYSITELIB}/bzrlib/tests/test_xml.pyc
 ${PYSITELIB}/bzrlib/tests/test_xml.pyo
+${PYSITELIB}/bzrlib/tests/testui.py
+${PYSITELIB}/bzrlib/tests/testui.pyc
+${PYSITELIB}/bzrlib/tests/testui.pyo
 ${PYSITELIB}/bzrlib/tests/transport_util.py
 ${PYSITELIB}/bzrlib/tests/transport_util.pyc
 ${PYSITELIB}/bzrlib/tests/transport_util.pyo
@@ -2017,6 +2210,9 @@ ${PYSITELIB}/bzrlib/transport/ftp/__init__.pyo
 ${PYSITELIB}/bzrlib/transport/ftp/_gssapi.py
 ${PYSITELIB}/bzrlib/transport/ftp/_gssapi.pyc
 ${PYSITELIB}/bzrlib/transport/ftp/_gssapi.pyo
+${PYSITELIB}/bzrlib/transport/gio_transport.py
+${PYSITELIB}/bzrlib/transport/gio_transport.pyc
+${PYSITELIB}/bzrlib/transport/gio_transport.pyo
 ${PYSITELIB}/bzrlib/transport/http/__init__.py
 ${PYSITELIB}/bzrlib/transport/http/__init__.pyc
 ${PYSITELIB}/bzrlib/transport/http/__init__.pyo
@@ -2098,15 +2294,15 @@ ${PYSITELIB}/bzrlib/upgrade.pyo
 ${PYSITELIB}/bzrlib/urlutils.py
 ${PYSITELIB}/bzrlib/urlutils.pyc
 ${PYSITELIB}/bzrlib/urlutils.pyo
+${PYSITELIB}/bzrlib/utextwrap.py
+${PYSITELIB}/bzrlib/utextwrap.pyc
+${PYSITELIB}/bzrlib/utextwrap.pyo
 ${PYSITELIB}/bzrlib/util/__init__.py
 ${PYSITELIB}/bzrlib/util/__init__.pyc
 ${PYSITELIB}/bzrlib/util/__init__.pyo
 ${PYSITELIB}/bzrlib/util/_bencode_py.py
 ${PYSITELIB}/bzrlib/util/_bencode_py.pyc
 ${PYSITELIB}/bzrlib/util/_bencode_py.pyo
-${PYSITELIB}/bzrlib/util/bencode.py
-${PYSITELIB}/bzrlib/util/bencode.pyc
-${PYSITELIB}/bzrlib/util/bencode.pyo
 ${PYSITELIB}/bzrlib/util/configobj/__init__.py
 ${PYSITELIB}/bzrlib/util/configobj/__init__.pyc
 ${PYSITELIB}/bzrlib/util/configobj/__init__.pyo
@@ -2158,15 +2354,15 @@ ${PYSITELIB}/bzrlib/version_info_formats/format_rio.pyo
 ${PYSITELIB}/bzrlib/versionedfile.py
 ${PYSITELIB}/bzrlib/versionedfile.pyc
 ${PYSITELIB}/bzrlib/versionedfile.pyo
+${PYSITELIB}/bzrlib/vf_repository.py
+${PYSITELIB}/bzrlib/vf_repository.pyc
+${PYSITELIB}/bzrlib/vf_repository.pyo
 ${PYSITELIB}/bzrlib/views.py
 ${PYSITELIB}/bzrlib/views.pyc
 ${PYSITELIB}/bzrlib/views.pyo
 ${PYSITELIB}/bzrlib/weave.py
 ${PYSITELIB}/bzrlib/weave.pyc
 ${PYSITELIB}/bzrlib/weave.pyo
-${PYSITELIB}/bzrlib/weave_commands.py
-${PYSITELIB}/bzrlib/weave_commands.pyc
-${PYSITELIB}/bzrlib/weave_commands.pyo
 ${PYSITELIB}/bzrlib/weavefile.py
 ${PYSITELIB}/bzrlib/weavefile.pyc
 ${PYSITELIB}/bzrlib/weavefile.pyo
@@ -2176,12 +2372,12 @@ ${PYSITELIB}/bzrlib/win32utils.pyo
 ${PYSITELIB}/bzrlib/workingtree.py
 ${PYSITELIB}/bzrlib/workingtree.pyc
 ${PYSITELIB}/bzrlib/workingtree.pyo
+${PYSITELIB}/bzrlib/workingtree_3.py
+${PYSITELIB}/bzrlib/workingtree_3.pyc
+${PYSITELIB}/bzrlib/workingtree_3.pyo
 ${PYSITELIB}/bzrlib/workingtree_4.py
 ${PYSITELIB}/bzrlib/workingtree_4.pyc
 ${PYSITELIB}/bzrlib/workingtree_4.pyo
-${PYSITELIB}/bzrlib/xml4.py
-${PYSITELIB}/bzrlib/xml4.pyc
-${PYSITELIB}/bzrlib/xml4.pyo
 ${PYSITELIB}/bzrlib/xml5.py
 ${PYSITELIB}/bzrlib/xml5.pyc
 ${PYSITELIB}/bzrlib/xml5.pyo
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 91b45eaf650..0f68d3869b0 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.37 2010/12/04 01:21:06 gdt Exp $
+$NetBSD: distinfo,v 1.38 2011/11/27 13:31:23 cheusov Exp $
 
-SHA1 (bzr-2.1.1.tar.gz) = f8628ef1a9e9b7a397a8d673cef677e5449f6e95
-RMD160 (bzr-2.1.1.tar.gz) = a1c6e91907954d2bbaa117eafccaa69d70d0c337
-Size (bzr-2.1.1.tar.gz) = 6786377 bytes
-SHA1 (patch-aa) = 8eda90885b3127525330cd3432538fb2b4df98c1
-SHA1 (patch-ab) = ea67de3b217fb5106b17d129a84f9024a60890e2
+SHA1 (bzr-2.4.2.tar.gz) = 3663b862dc8fb9729f9aae2427cbab2af9c901ad
+RMD160 (bzr-2.4.2.tar.gz) = 47ecfd1651d10aeea28c0dff3124c637dbbb93ab
+Size (bzr-2.4.2.tar.gz) = 7528721 bytes
+SHA1 (patch-ab) = 2de173e9703e8651cbf5a414c596c697268b27fe
diff --git a/devel/bzr/patches/patch-aa b/devel/bzr/patches/patch-aa
deleted file mode 100644
index f2f909d8876..00000000000
--- a/devel/bzr/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/10/16 00:45:25 wiz Exp $
-
---- contrib/fortune.orig	2006-10-01 23:39:28.000000000 +0000
-+++ contrib/fortune
-@@ -3,14 +3,14 @@
- # Put this on your $BZRPATH to use it to demonstrate bzr external plugins
- 
- 
--if [ x$1 == x--bzr-usage ]
-+if [ x$1 = x--bzr-usage ]
- then
-     # options
-     echo ""
-     # arguments
-     echo ""
-     exit 0
--elif [ x$1 == x--bzr-help ]
-+elif [ x$1 = x--bzr-help ]
- then
-     echo "display a fortune cookie"
-     echo 
diff --git a/devel/bzr/patches/patch-ab b/devel/bzr/patches/patch-ab
index e53968a92eb..3c7d8aaf961 100644
--- a/devel/bzr/patches/patch-ab
+++ b/devel/bzr/patches/patch-ab
@@ -1,5 +1,6 @@
-$NetBSD: patch-ab,v 1.7 2010/12/04 01:21:06 gdt Exp $
+$NetBSD: patch-ab,v 1.8 2011/11/27 13:31:23 cheusov Exp $
 
+# Honor PKGMANDIR
 --- setup.py.orig	2010-03-24 07:18:08.000000000 +0000
 +++ setup.py
 @@ -709,7 +709,7 @@ else:
diff --git a/devel/bzr/plugin.mk b/devel/bzr/plugin.mk
index 8abefe86a42..c3f9f5ff86e 100644
--- a/devel/bzr/plugin.mk
+++ b/devel/bzr/plugin.mk
@@ -1,10 +1,10 @@
-# $NetBSD: plugin.mk,v 1.2 2009/06/14 22:57:59 joerg Exp $
+# $NetBSD: plugin.mk,v 1.3 2011/11/27 13:31:23 cheusov Exp $
 
 BZR_PLUGIN_NAME?=	${PKGBASE:S/^bzr-//}
 BZR_PLUGIN_TEST?=	yes
 BZR_PLUGIN_TEST_DIR?=	${WRKSRC}/build/lib/bzrlib/plugins
 
-DEPENDS+=		bzr>=1.6:../../devel/bzr
+DEPENDS+=		bzr>=2.4:../../devel/bzr
 
 # stolen from graphics/hicolor-icon-theme
 .include "../../mk/bsd.fast.prefs.mk"