- Update to 0.9

PR:		ports/102257
Submitted by:	Ulf Lilleengen <lulf(at)stud.ntnu.no> (maintainer)
Approved by:	krion (mentor)

8 files changed, 494 insertions, 108 deletions

diff --git a/devel/bazaar-ng/Makefile b/devel/bazaar-ng/Makefile
index 66ef2d873637..1a3b45534dfb 100644
--- a/devel/bazaar-ng/Makefile
+++ b/devel/bazaar-ng/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.8.2
+PORTVERSION=	0.9
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/pkg/ \
 		http://voodoo.bawue.com/download/
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	gnu-arch
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	lulf@stud.ntnu.no
-COMMENT=	A Python implementation of the GNU arch RCS protocol by Canonical
+COMMENT=	Distributed version control system by Canonical
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree
 
diff --git a/devel/bazaar-ng/distinfo b/devel/bazaar-ng/distinfo
index a8c7c52b98e9..8b477cacb1fc 100644
--- a/devel/bazaar-ng/distinfo
+++ b/devel/bazaar-ng/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.8.2.tar.gz) = 9bcfcc2a60156a5a74e247846ebe7473
-SHA256 (bzr-0.8.2.tar.gz) = 81d982a6aa875b30e4c1ba2d1ade17b34f90fa533e815e3a744bc244745e3144
-SIZE (bzr-0.8.2.tar.gz) = 720152
+MD5 (bzr-0.9.tar.gz) = 46a3320a7830b13516bef084bb87d86c
+SHA256 (bzr-0.9.tar.gz) = a50ec64ee581d9ecfb0b87098398b3fbbe19c9bd55a7782f75fe7232d83fcf90
+SIZE (bzr-0.9.tar.gz) = 935724
diff --git a/devel/bazaar-ng/pkg-descr b/devel/bazaar-ng/pkg-descr
index 6becea9b6451..2c105dd260a5 100644
--- a/devel/bazaar-ng/pkg-descr
+++ b/devel/bazaar-ng/pkg-descr
@@ -1,9 +1,8 @@
-Bazaar-NG is an implementation of GNU arch from Canonical written in Python.
-Arch is a version control system, which allows you to keep old versions of
-files and directories (usually source code), keep a log of who, when, and
-why changes occurred, etc., like SVN, CVS, or RCS. Arch is distributed, which
-gives it significant advantages and some disadvantages compared to SVN and
-CVS. The bzr implementation is the next Bazaar version from Canonical called
-Bazaar-NG.
+Bazaar-NG is a distributed version control system from Canonical.
+Bazaar-NG allows you to keep old versions of files and directories (usually
+source code), keep a log of who, when, and why changes occurred, etc., like SVN,
+CVS, or RCS. Bazaar-NG is distributed, which gives it significant advantages and
+some disadvantages compared to SVN and CVS. The bzr implementation is the next
+Bazaar version from Canonical called Bazaar-NG.
 
-WWW: http://www.bazaar-ng.org/
+WWW: http://bazaar-vcs.org/
diff --git a/devel/bazaar-ng/pkg-plist b/devel/bazaar-ng/pkg-plist
index ac5b8b5f0ad7..dafcf124d3d4 100644
--- a/devel/bazaar-ng/pkg-plist
+++ b/devel/bazaar-ng/pkg-plist
@@ -19,10 +19,11 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.py
-%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.py
 %%PYTHON_SITELIBDIR%%/bzrlib/help.py
+%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.py
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/info.py
+%%PYTHON_SITELIBDIR%%/bzrlib/ignores.py
 %%PYTHON_SITELIBDIR%%/bzrlib/inter.py
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.py
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.py
@@ -40,14 +41,22 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/option.py
 %%PYTHON_SITELIBDIR%%/bzrlib/osutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/patches.py
+%%PYTHON_SITELIBDIR%%/bzrlib/patiencediff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.py
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.py
+%%PYTHON_SITELIBDIR%%/bzrlib/revisiontree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/rio.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.py
 %%PYTHON_SITELIBDIR%%/bzrlib/sign_my_commits.py
 %%PYTHON_SITELIBDIR%%/bzrlib/status.py
@@ -60,25 +69,57 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.py
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/upgrade.py
+%%PYTHON_SITELIBDIR%%/bzrlib/urlutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.py
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.py
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.py
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_bench.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_checkout.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_log.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_osutils.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_rocks.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_bench.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_checkout.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_log.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_osutils.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_rocks.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_bench.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_checkout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_log.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_osutils.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_rocks.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/export/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/export/dir_exporter.py
 %%PYTHON_SITELIBDIR%%/bzrlib/export/tar_exporter.py
@@ -121,14 +162,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/store/text.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/store/text.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.py
@@ -136,17 +181,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_doc_generate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_errors.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockable_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockdir.py
@@ -160,14 +206,16 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_progress.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revprops.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.py
@@ -175,6 +223,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.py
@@ -185,10 +234,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.py
@@ -196,32 +247,46 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_add.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_added.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_aliases.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ancestry.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_annotate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bound_branches.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_branch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_non_ascii.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_outside_wt.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_push.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_re_sign.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_selftest.py
@@ -233,71 +298,98 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_update.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_added.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_aliases.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ancestry.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_annotate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bound_branches.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_branch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_non_ascii.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_outside_wt.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_push.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_re_sign.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_selftest.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_shared_repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_sign_my_commits.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_too_much.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_uncommit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_update.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_added.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_aliases.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ancestry.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_annotate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bound_branches.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_branch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_non_ascii.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_outside_wt.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_push.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_re_sign.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_selftest.pyo
@@ -309,11 +401,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_update.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.py
@@ -322,6 +416,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.pyc
@@ -330,6 +426,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.pyo
@@ -346,6 +444,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/test_compare.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/test_compare.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/test_compare.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/test_join.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/__init__.pyc
@@ -354,50 +458,85 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/test_join.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_commit_builder.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_revprops.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_commit_builder.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_revprops.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_commit_builder.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_revprops.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/test_all.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/test_all.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/test_all.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.pyc
@@ -405,17 +544,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_doc_generate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockable_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockdir.pyc
@@ -429,14 +569,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_progress.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revprops.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.pyc
@@ -444,6 +587,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyc
@@ -454,24 +598,29 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.pyo
@@ -479,17 +628,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_doc_generate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockable_files.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockdir.pyo
@@ -503,14 +653,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_progress.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revprops.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.pyo
@@ -518,6 +671,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyo
@@ -528,10 +682,11 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyo
@@ -549,13 +704,19 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl_errors.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/response.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl_errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/response.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl_errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/response.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakenfs.pyc
@@ -601,15 +762,33 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/http_manager.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/validate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/validate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/validate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyc
@@ -624,41 +803,44 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/conflicts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/decorators.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/info.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/ignores.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/inter.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/knit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lockable_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lockdir.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lsprof.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/option.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/osutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/patches.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/patiencediff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/revisiontree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/sign_my_commits.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/status.pyc
@@ -670,22 +852,24 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/urlutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/branch.pyo
@@ -704,10 +888,11 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/info.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/ignores.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyo
@@ -725,41 +910,46 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/option.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/osutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/patches.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/patiencediff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/revisiontree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/rio.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/sign_my_commits.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/status.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/urlutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc/api
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/export
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins
@@ -770,9 +960,11 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport/http
@@ -783,4 +975,6 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 66ef2d873637..1a3b45534dfb 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.8.2
+PORTVERSION=	0.9
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/pkg/ \
 		http://voodoo.bawue.com/download/
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	gnu-arch
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	lulf@stud.ntnu.no
-COMMENT=	A Python implementation of the GNU arch RCS protocol by Canonical
+COMMENT=	Distributed version control system by Canonical
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree
 
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index a8c7c52b98e9..8b477cacb1fc 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.8.2.tar.gz) = 9bcfcc2a60156a5a74e247846ebe7473
-SHA256 (bzr-0.8.2.tar.gz) = 81d982a6aa875b30e4c1ba2d1ade17b34f90fa533e815e3a744bc244745e3144
-SIZE (bzr-0.8.2.tar.gz) = 720152
+MD5 (bzr-0.9.tar.gz) = 46a3320a7830b13516bef084bb87d86c
+SHA256 (bzr-0.9.tar.gz) = a50ec64ee581d9ecfb0b87098398b3fbbe19c9bd55a7782f75fe7232d83fcf90
+SIZE (bzr-0.9.tar.gz) = 935724
diff --git a/devel/bzr/pkg-descr b/devel/bzr/pkg-descr
index 6becea9b6451..2c105dd260a5 100644
--- a/devel/bzr/pkg-descr
+++ b/devel/bzr/pkg-descr
@@ -1,9 +1,8 @@
-Bazaar-NG is an implementation of GNU arch from Canonical written in Python.
-Arch is a version control system, which allows you to keep old versions of
-files and directories (usually source code), keep a log of who, when, and
-why changes occurred, etc., like SVN, CVS, or RCS. Arch is distributed, which
-gives it significant advantages and some disadvantages compared to SVN and
-CVS. The bzr implementation is the next Bazaar version from Canonical called
-Bazaar-NG.
+Bazaar-NG is a distributed version control system from Canonical.
+Bazaar-NG allows you to keep old versions of files and directories (usually
+source code), keep a log of who, when, and why changes occurred, etc., like SVN,
+CVS, or RCS. Bazaar-NG is distributed, which gives it significant advantages and
+some disadvantages compared to SVN and CVS. The bzr implementation is the next
+Bazaar version from Canonical called Bazaar-NG.
 
-WWW: http://www.bazaar-ng.org/
+WWW: http://bazaar-vcs.org/
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index ac5b8b5f0ad7..dafcf124d3d4 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -19,10 +19,11 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.py
-%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.py
 %%PYTHON_SITELIBDIR%%/bzrlib/help.py
+%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.py
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/info.py
+%%PYTHON_SITELIBDIR%%/bzrlib/ignores.py
 %%PYTHON_SITELIBDIR%%/bzrlib/inter.py
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.py
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.py
@@ -40,14 +41,22 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/option.py
 %%PYTHON_SITELIBDIR%%/bzrlib/osutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/patches.py
+%%PYTHON_SITELIBDIR%%/bzrlib/patiencediff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.py
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.py
+%%PYTHON_SITELIBDIR%%/bzrlib/revisiontree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/rio.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.py
 %%PYTHON_SITELIBDIR%%/bzrlib/sign_my_commits.py
 %%PYTHON_SITELIBDIR%%/bzrlib/status.py
@@ -60,25 +69,57 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.py
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/upgrade.py
+%%PYTHON_SITELIBDIR%%/bzrlib/urlutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.py
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.py
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.py
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/api/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/doc/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_bench.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_checkout.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_log.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_osutils.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_rocks.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_bench.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_checkout.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_log.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_osutils.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_rocks.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_bench.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_checkout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_log.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_osutils.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_rocks.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_workingtree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/export/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/export/dir_exporter.py
 %%PYTHON_SITELIBDIR%%/bzrlib/export/tar_exporter.py
@@ -121,14 +162,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/store/text.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/store/text.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.py
@@ -136,17 +181,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_doc_generate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_errors.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockable_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockdir.py
@@ -160,14 +206,16 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_progress.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revprops.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.py
@@ -175,6 +223,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.py
@@ -185,10 +234,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.py
@@ -196,32 +247,46 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_add.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_added.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_aliases.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ancestry.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_annotate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bound_branches.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_branch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_non_ascii.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_outside_wt.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_push.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_re_sign.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_selftest.py
@@ -233,71 +298,98 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_update.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_added.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_aliases.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ancestry.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_annotate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bound_branches.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_branch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_non_ascii.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_outside_wt.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_push.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_re_sign.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_selftest.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_shared_repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_sign_my_commits.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_too_much.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_uncommit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_update.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_added.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_aliases.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ancestry.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_annotate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bound_branches.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_branch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_checkout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_command_encoding.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_conflicts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_exceptions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_help.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_find_merge_base.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignore.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ignored.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_non_ascii.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_outside_wt.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_push.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_re_sign.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revert.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_history.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_selftest.pyo
@@ -309,11 +401,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_update.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.py
@@ -322,6 +416,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.pyc
@@ -330,6 +426,8 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_bound_sftp.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_branch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_locking.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_parent.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_permissions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.pyo
@@ -346,6 +444,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations/test_interrepository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/test_compare.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/test_compare.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations/test_compare.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/test_join.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/__init__.pyc
@@ -354,50 +458,85 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations/test_join.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_commit_builder.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_revprops.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_commit_builder.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_revprops.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_commit_builder.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_fileid_involved.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_reconcile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_repository.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_revprops.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/test_all.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/test_all.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations/test_all.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_break_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_changes_from.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_executable.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_is_ignored.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_locking.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_pull.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.pyc
@@ -405,17 +544,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_doc_generate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockable_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockdir.pyc
@@ -429,14 +569,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_progress.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revprops.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.pyc
@@ -444,6 +587,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyc
@@ -454,24 +598,29 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/EncodingAdapter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/lock_helpers.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bzrdir.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.pyo
@@ -479,17 +628,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_decorators.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_doc_generate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_escaped_store.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_knit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockable_files.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_lockdir.pyo
@@ -503,14 +653,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_progress.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_read_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reconcile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revprops.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisiontree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.pyo
@@ -518,6 +671,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyo
@@ -528,10 +682,11 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport_implementations.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tuned_gzip.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_urlutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_versionedfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyo
@@ -549,13 +704,19 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl_errors.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/response.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl_errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/response.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_pycurl_errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/response.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/fakenfs.pyc
@@ -601,15 +762,33 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/http_manager.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/validate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/validate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/validate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer/v08.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/commands.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bundle/common.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyc
@@ -624,41 +803,44 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/conflicts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/decorators.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/info.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/ignores.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/inter.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/iterablefile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/knit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lockable_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lockdir.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/lsprof.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/option.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/osutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/patches.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/patiencediff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/revisiontree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/rio.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/sign_my_commits.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/status.pyc
@@ -670,22 +852,24 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/urlutils.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/branch.pyo
@@ -704,10 +888,11 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/help.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/info.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/ignores.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyo
@@ -725,41 +910,46 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/option.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/osutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/patches.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/patiencediff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/reconcile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/revisiontree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/rio.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/sign_my_commits.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/status.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textmerge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transform.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tuned_gzip.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/uncommit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/urlutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc/api
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/export
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins
@@ -770,9 +960,11 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/interrepository_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/intertree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/interversionedfile_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/revisionstore_implementations
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport/http
@@ -783,4 +975,6 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/