3 files changed, 185 insertions, 10 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index efc81388d86a..2e5922b92718 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.14
+PORTVERSION=	0.15
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/
 MASTER_SITE_SUBDIR=	gnu-arch
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 2d56e0dea8a2..3dd6ab9806b7 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.14.tar.gz) = 281c777f377cc149b6ba60c720f70033
-SHA256 (bzr-0.14.tar.gz) = c1c47236e985b11069fd432a327cffb5d2de5af4035df22b434f24d916e4749f
-SIZE (bzr-0.14.tar.gz) = 1159335
+MD5 (bzr-0.15.tar.gz) = 6512ced21dc26fba0915c50697f74e17
+SHA256 (bzr-0.15.tar.gz) = d84969833e1d588df3715e4910b891cbcc310a332796e0ce6528dd3b633c3171
+SIZE (bzr-0.15.tar.gz) = 1363733
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index 08de89543d4f..2b9b135d89a3 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -17,6 +17,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/decorators.py
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.py
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.py
+%%PYTHON_SITELIBDIR%%/bzrlib/dirstate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.py
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.py
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.py
@@ -46,6 +47,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/memorytree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.py
+%%PYTHON_SITELIBDIR%%/bzrlib/merge_directive.py
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.py
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.py
 %%PYTHON_SITELIBDIR%%/bzrlib/mutabletree.py
@@ -67,7 +69,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/sign_my_commits.py
 %%PYTHON_SITELIBDIR%%/bzrlib/status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tag.py
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.py
+%%PYTHON_SITELIBDIR%%/bzrlib/timestamp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.py
@@ -87,11 +91,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.py
-%%PYTHON_SITELIBDIR%%/bzrlib/win32console.py
+%%PYTHON_SITELIBDIR%%/bzrlib/win32utils.py
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/workingtree_4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.py
+%%PYTHON_SITELIBDIR%%/bzrlib/xml7.py
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/apply_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/bundle/bundle_data.py
@@ -208,16 +214,31 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/export/zip_exporter.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_indirect.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_registration.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_indirect.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_register.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_indirect.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_registration.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_indirect.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_register.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_indirect.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/lp_registration.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_lp_indirect.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad/test_register.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/repofmt/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/repofmt/knitrepo.py
+%%PYTHON_SITELIBDIR%%/bzrlib/repofmt/weaverepo.py
+%%PYTHON_SITELIBDIR%%/bzrlib/repofmt/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/repofmt/knitrepo.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/repofmt/weaverepo.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/repofmt/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/repofmt/knitrepo.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/repofmt/weaverepo.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/store/text.py
 %%PYTHON_SITELIBDIR%%/bzrlib/store/revision/__init__.py
@@ -258,10 +279,13 @@ 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_delta.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_dirstate.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_extract.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ftp_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_generate_docs.py
@@ -271,6 +295,7 @@ bin/bzr
 %%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_https_ca_bundle.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.py
@@ -285,6 +310,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_directive.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.py
@@ -312,12 +338,16 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ssh_transport.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_subsume.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tag.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textfile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textmerge.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_timestamp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_trace.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transactions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.py
@@ -336,6 +366,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree_4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_wsgi.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.py
@@ -365,11 +396,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_join.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_locale.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_merge_directive.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_nick.py
@@ -378,7 +411,6 @@ bin/bzr
 %%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_ls.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconcile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remove.py
@@ -391,12 +423,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_serve.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_shared_repository.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_sign_my_commits.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_split.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_tags.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_testament.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_too_much.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_uncommit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_update.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_version.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_version_info.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.py
@@ -426,10 +461,13 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_join.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_locale.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_ls.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge_directive.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_nick.pyc
@@ -451,12 +489,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_serve.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_split.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_tags.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_testament.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_version.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_version_info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyc
@@ -486,10 +527,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_init.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_join.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_locale.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_logformats.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_merge_directive.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_mv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_nick.pyo
@@ -510,12 +553,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_serve.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_shared_repository.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_sign_my_commits.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_split.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_tags.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_testament.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_too_much.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_uncommit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_update.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_upgrade.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_version.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_version_info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_whoami.pyo
@@ -523,32 +569,62 @@ bin/bzr
 %%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_commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_hooks.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.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
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_push.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_uncommit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_update.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.pyc
 %%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_commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_hooks.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.pyo
 %%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
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_push.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_uncommit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_update.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/__init__.pyo
 %%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_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_create_checkout.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_hooks.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_http.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_last_revision_info.pyc
 %%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_push.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_uncommit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_pull.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_update.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/branch_implementations/test_tags.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_temporary_write_lock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_temporary_write_lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock/test_temporary_write_lock.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/test_bzrdir.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/bzrdir_implementations/__init__.pyc
@@ -594,12 +670,19 @@ bin/bzr
 %%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_revision.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_statistics.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_statistics.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/repository_implementations/test_statistics.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/tree_implementations/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.py
@@ -609,6 +692,24 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_test_trees.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_inv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_list_files.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_revision_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_walkdirs.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_inv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_list_files.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_revision_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_walkdirs.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_symlink_target.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_inv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_list_files.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_revision_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_walkdirs.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
@@ -630,6 +731,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_move.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_rename_one.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_revision_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_smart_add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.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
@@ -651,6 +763,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_move.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_rename_one.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_revision_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_smart_add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.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
@@ -672,6 +795,17 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_set_root_id.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_unversion.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_workingtree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_add_reference.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_basis_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_inv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_move.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_paths2ids.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_rename_one.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_revision_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_smart_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_walkdirs.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/diff
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/diff-2
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data/diff-3
@@ -714,10 +848,13 @@ 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_delta.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_dirstate.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_extract.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ftp_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_generate_docs.pyc
@@ -727,6 +864,7 @@ bin/bzr
 %%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_https_ca_bundle.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyc
@@ -739,6 +877,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_memorytree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_directive.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.pyc
@@ -769,12 +908,16 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ssh_transport.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_subsume.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tag.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textmerge.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_timestamp.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_trace.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transactions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.pyc
@@ -792,6 +935,7 @@ bin/bzr
 %%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_workingtree_4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_wsgi.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyc
@@ -817,10 +961,13 @@ 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_delta.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_dirstate.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_extract.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ftp_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_generate_docs.pyo
@@ -830,6 +977,7 @@ bin/bzr
 %%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_https_ca_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ignores.pyo
@@ -844,6 +992,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_directive.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyo
@@ -868,16 +1017,20 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ssh_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_transport.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_subsume.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tag.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_textmerge.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_timestamp.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_trace.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transactions.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transform.pyo
@@ -895,6 +1048,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree_4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_wsgi.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyo
@@ -931,6 +1085,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/_urllib2_wrappers.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/response.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http/wsgi.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/ca_bundle.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/ca_bundle.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http/ca_bundle.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/chroot.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/decorator.pyc
@@ -962,6 +1119,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.py
+%%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.pyc
@@ -1088,7 +1248,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyc
@@ -1182,12 +1341,26 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/versionedfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weave_commands.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/workingtree_4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml6.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/xml7.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml_serializer.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/dirstate.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/merge_directive.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tag.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/timestamp.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/win32utils.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/workingtree_4.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/xml7.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/dirstate.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/merge_directive.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tag.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/timestamp.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/win32utils.pyo
+
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle/serializer
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/bundle
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator
@@ -1196,7 +1369,8 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/doc
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/export
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/launchpad
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins
+@dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/repofmt
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/store/revision
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/store/versioned
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/store
@@ -1211,6 +1385,7 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_patches_data
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_lock
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport/http
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport
@@ -1221,4 +1396,4 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/version_info_formats
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib
+@dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib