6 files changed, 88 insertions, 24 deletions

diff --git a/devel/bazaar-ng/Makefile b/devel/bazaar-ng/Makefile
index ad3845b9ef89..fb64831d741c 100644
--- a/devel/bazaar-ng/Makefile
+++ b/devel/bazaar-ng/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	1.15
+PORTVERSION=	1.16
 CATEGORIES=	devel
-MASTER_SITES=	https://launchpadlibrarian.net/27074733/
+MASTER_SITES=	https://launchpadlibrarian.net/28062196/
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	fullermd@over-yonder.net
 COMMENT=	Distributed version control system by Canonical
 
-# Needed for 1.15 for files normally pre-built
+# Often not needed, but it's cheap insurance
 BUILD_DEPENDS=	pyrexc:${PORTSDIR}/devel/pyrex
 
 OPTIONS=	SFTP "Enable Paramiko for SFTP support" on
diff --git a/devel/bazaar-ng/distinfo b/devel/bazaar-ng/distinfo
index d31d47833241..da415713fd81 100644
--- a/devel/bazaar-ng/distinfo
+++ b/devel/bazaar-ng/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-1.15.tar.gz) = 3309f74f1655d7971ca8cc3d4c9e9dfb
-SHA256 (bzr-1.15.tar.gz) = 070c913a28365d14e774d27dd54fae32b0c6d50180f03cd09cb7a4e35e30edf4
-SIZE (bzr-1.15.tar.gz) = 4179567
+MD5 (bzr-1.16.tar.gz) = e18b38e2c4e33203c8f6c9b4029cea7a
+SHA256 (bzr-1.16.tar.gz) = 31a583bb5e58403886b9a54b426ffb6d8e11702c2e527ebce5b6766919c7aebd
+SIZE (bzr-1.16.tar.gz) = 5075879
diff --git a/devel/bazaar-ng/pkg-plist b/devel/bazaar-ng/pkg-plist
index ad6aa4e86a79..7e0fb0e901cb 100644
--- a/devel/bazaar-ng/pkg-plist
+++ b/devel/bazaar-ng/pkg-plist
@@ -2,6 +2,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_bencode_pyx.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_c.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_py.pyc
@@ -34,6 +35,10 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/_readdir_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_readdir_py.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/_readdir_pyx.so
+%%PYTHON_SITELIBDIR%%/bzrlib/_rio_py.py
+%%PYTHON_SITELIBDIR%%/bzrlib/_rio_py.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/_rio_py.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_rio_pyx.so
 %%PYTHON_SITELIBDIR%%/bzrlib/add.py
 %%PYTHON_SITELIBDIR%%/bzrlib/add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
@@ -100,6 +105,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_tags.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_tags.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_tags.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.pyo
@@ -124,6 +132,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/simple_many_commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/simple_many_commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/simple_many_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bencode.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bencode.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bencode.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/bisect_multi.py
 %%PYTHON_SITELIBDIR%%/bzrlib/bisect_multi.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/bisect_multi.pyo
@@ -507,6 +518,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/rules.py
 %%PYTHON_SITELIBDIR%%/bzrlib/rules.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/rules.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/send.py
+%%PYTHON_SITELIBDIR%%/bzrlib/send.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/send.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/serializer.py
 %%PYTHON_SITELIBDIR%%/bzrlib/serializer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/serializer.pyo
@@ -1155,6 +1169,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_default_stacking.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_default_stacking.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_default_stacking.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_fetch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_fetch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_fetch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_initialize.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_initialize.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_initialize.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_unlock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_unlock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_unlock.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.pyo
@@ -1176,6 +1199,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__groupcompress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__groupcompress.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__groupcompress.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__rio.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__rio.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__rio.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__walkdirs_win32.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__walkdirs_win32.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__walkdirs_win32.pyo
@@ -1194,6 +1220,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bencode.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bencode.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bencode.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bisect_multi.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bisect_multi.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bisect_multi.pyo
@@ -1221,6 +1250,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chk_map.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chk_map.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chk_map.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chk_serializer.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chk_serializer.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chk_serializer.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chunk_writer.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chunk_writer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chunk_writer.pyo
@@ -1661,6 +1693,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_with_stat.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_with_stat.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_with_stat.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.pyo
@@ -1733,9 +1768,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_with_stat.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_with_stat.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_with_stat.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyo
@@ -1940,6 +1972,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/util/_bencode_py.py
+%%PYTHON_SITELIBDIR%%/bzrlib/util/_bencode_py.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/_bencode_py.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.pyo
@@ -1976,9 +2011,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/util/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/util/tests/test_bencode.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/tests/test_bencode.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/tests/test_bencode.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/version.py
 %%PYTHON_SITELIBDIR%%/bzrlib/version.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/version.pyo
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index ad3845b9ef89..fb64831d741c 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	1.15
+PORTVERSION=	1.16
 CATEGORIES=	devel
-MASTER_SITES=	https://launchpadlibrarian.net/27074733/
+MASTER_SITES=	https://launchpadlibrarian.net/28062196/
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	fullermd@over-yonder.net
 COMMENT=	Distributed version control system by Canonical
 
-# Needed for 1.15 for files normally pre-built
+# Often not needed, but it's cheap insurance
 BUILD_DEPENDS=	pyrexc:${PORTSDIR}/devel/pyrex
 
 OPTIONS=	SFTP "Enable Paramiko for SFTP support" on
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index d31d47833241..da415713fd81 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-1.15.tar.gz) = 3309f74f1655d7971ca8cc3d4c9e9dfb
-SHA256 (bzr-1.15.tar.gz) = 070c913a28365d14e774d27dd54fae32b0c6d50180f03cd09cb7a4e35e30edf4
-SIZE (bzr-1.15.tar.gz) = 4179567
+MD5 (bzr-1.16.tar.gz) = e18b38e2c4e33203c8f6c9b4029cea7a
+SHA256 (bzr-1.16.tar.gz) = 31a583bb5e58403886b9a54b426ffb6d8e11702c2e527ebce5b6766919c7aebd
+SIZE (bzr-1.16.tar.gz) = 5075879
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index ad6aa4e86a79..7e0fb0e901cb 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -2,6 +2,7 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_bencode_pyx.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_c.so
 %%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_py.py
 %%PYTHON_SITELIBDIR%%/bzrlib/_btree_serializer_py.pyc
@@ -34,6 +35,10 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/_readdir_py.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/_readdir_py.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/_readdir_pyx.so
+%%PYTHON_SITELIBDIR%%/bzrlib/_rio_py.py
+%%PYTHON_SITELIBDIR%%/bzrlib/_rio_py.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/_rio_py.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/_rio_pyx.so
 %%PYTHON_SITELIBDIR%%/bzrlib/add.py
 %%PYTHON_SITELIBDIR%%/bzrlib/add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
@@ -100,6 +105,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_status.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_tags.py
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_tags.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_tags.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/bench_transform.pyo
@@ -124,6 +132,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/simple_many_commit.py
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/simple_many_commit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/benchmarks/tree_creator/simple_many_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/bencode.py
+%%PYTHON_SITELIBDIR%%/bzrlib/bencode.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/bencode.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/bisect_multi.py
 %%PYTHON_SITELIBDIR%%/bzrlib/bisect_multi.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/bisect_multi.pyo
@@ -507,6 +518,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/rules.py
 %%PYTHON_SITELIBDIR%%/bzrlib/rules.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/rules.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/send.py
+%%PYTHON_SITELIBDIR%%/bzrlib/send.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/send.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/serializer.py
 %%PYTHON_SITELIBDIR%%/bzrlib/serializer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/serializer.pyo
@@ -1155,6 +1169,15 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_default_stacking.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_default_stacking.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_default_stacking.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_fetch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_fetch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_fetch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_initialize.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_initialize.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_initialize.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_unlock.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_unlock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_repository_reference/test_unlock.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/ssl_certs/__init__.pyo
@@ -1176,6 +1199,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__groupcompress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__groupcompress.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__groupcompress.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__rio.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__rio.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test__rio.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__walkdirs_win32.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__walkdirs_win32.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test__walkdirs_win32.pyo
@@ -1194,6 +1220,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bencode.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bencode.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bencode.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bisect_multi.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bisect_multi.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bisect_multi.pyo
@@ -1221,6 +1250,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chk_map.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chk_map.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chk_map.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chk_serializer.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chk_serializer.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chk_serializer.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chunk_writer.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chunk_writer.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_chunk_writer.pyo
@@ -1661,6 +1693,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_mtime.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_with_stat.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_with_stat.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_file_with_stat.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/tree_implementations/test_get_root_id.pyo
@@ -1733,9 +1768,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_with_stat.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_with_stat.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_file_with_stat.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyo
@@ -1940,6 +1972,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/util/_bencode_py.py
+%%PYTHON_SITELIBDIR%%/bzrlib/util/_bencode_py.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/_bencode_py.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/bencode.pyo
@@ -1976,9 +2011,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/util/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/util/tests/test_bencode.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/tests/test_bencode.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/tests/test_bencode.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/version.py
 %%PYTHON_SITELIBDIR%%/bzrlib/version.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/version.pyo