update: devel/bzr

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

update: devel/bzr

Okan Demirmen
for those interested in bzr, here's a long awaited update to 1.3.

basically, the 10k+ tests pass except 2, but those seem to be python
related rather that bzr (beware of the ulimit -n comment if you want to
do regress).

commentss, tests, ok's welcome.

cheers,
okan

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/bzr/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 8 Oct 2007 08:22:39 -0000 1.3
+++ Makefile 3 Apr 2008 21:21:11 -0000
@@ -4,8 +4,7 @@ SHARED_ONLY= Yes
 
 COMMENT= distributed version control system by Canonical
 
-DISTNAME= bzr-0.14
-PKGNAME= ${DISTNAME}p0
+DISTNAME= bzr-1.3
 CATEGORIES= devel
 
 HOMEPAGE= http://bazaar-vcs.org/
@@ -20,10 +19,18 @@ MASTER_SITES= ${HOMEPAGE}releases/src/
 
 MODULES= lang/python
 
-RUN_DEPENDS= ::textproc/py-cElementTree \
+RUN_DEPENDS+= ::lang/python/${MODPY_VERSION},-bz2 \
+ ::net/py-curl \
+ ::security/py-paramiko \
  ::textproc/gdiff
+
 REGRESS_DEPENDS=${RUN_DEPENDS}
 
+pre-configure:
+ @perl -pi -e s,!!MODPY_BIN!!,${MODPY_BIN}, ${WRKSRC}/bzr \
+ ${WRKSRC}/Makefile ${WRKSRC}/bzrlib/tests/test_diff.py
+
+# need at least ulimit -n 512
 do-regress:
  @cd ${WRKBUILD} && ./bzr selftest
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/bzr/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 5 Apr 2007 15:37:52 -0000 1.2
+++ distinfo 3 Apr 2008 21:21:11 -0000
@@ -1,5 +1,5 @@
-MD5 (bzr-0.14.tar.gz) = KBx3fzd8wUm2umDHIPcAMw==
-RMD160 (bzr-0.14.tar.gz) = 91zTfjwtMP/EgvIVzWDEfuOS804=
-SHA1 (bzr-0.14.tar.gz) = kMYnizMvNpWFym20e2XE58YNam8=
-SHA256 (bzr-0.14.tar.gz) = wcRyNumFsRBp/UMqMnz/tdLeWvQDXfIrQ08k2RbkdJ8=
-SIZE (bzr-0.14.tar.gz) = 1159335
+MD5 (bzr-1.3.tar.gz) = GvIzxvoKaIUbxhVbL1Y8MA==
+RMD160 (bzr-1.3.tar.gz) = 5758kORIvyLsWMgRUFxt0VGafks=
+SHA1 (bzr-1.3.tar.gz) = 5qkqsKv+VL/A+kkvEdxlu3Way0c=
+SHA256 (bzr-1.3.tar.gz) = Ra4dILigyx1FBEPZaftRdbkLxebhg6ZUhJNs+L4Ea3w=
+SIZE (bzr-1.3.tar.gz) = 3477457
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile 3 Apr 2008 21:21:11 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.orig Wed Apr  2 16:23:23 2008
++++ Makefile Wed Apr  2 16:24:06 2008
+@@ -20,7 +20,7 @@
+
+ ### Core Stuff ###
+
+-PYTHON=python
++PYTHON=!!MODPY_BIN!!
+
+ .PHONY: all clean extensions pyflakes api-docs
+
Index: patches/patch-bzr
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzr,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bzr
--- patches/patch-bzr 18 Mar 2007 20:05:28 -0000 1.1.1.1
+++ patches/patch-bzr 3 Apr 2008 21:21:11 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-bzr,v 1.1.1.1 2007/03/18 20:05:28 robert Exp $
---- bzr.orig Sun Mar 18 20:24:27 2007
-+++ bzr Sun Mar 18 20:24:42 2007
+--- bzr.orig Thu Mar 20 03:12:09 2008
++++ bzr Tue Apr  1 20:44:37 2008
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
-+#! /usr/bin/env python2.4
++#! !!MODPY_BIN!!
 
- # Copyright (C) 2005, 2006 Canonical Ltd
+ # Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
  #
Index: patches/patch-bzrlib_diff_py
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_diff_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bzrlib_diff_py
--- patches/patch-bzrlib_diff_py 18 Mar 2007 20:05:28 -0000 1.1.1.1
+++ patches/patch-bzrlib_diff_py 3 Apr 2008 21:21:11 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-bzrlib_diff_py,v 1.1.1.1 2007/03/18 20:05:28 robert Exp $
---- bzrlib/diff.py.orig Sun Mar 18 20:30:35 2007
-+++ bzrlib/diff.py Sun Mar 18 20:31:07 2007
-@@ -165,7 +165,7 @@ def external_diff(old_filename, oldlines
+--- bzrlib/diff.py.orig Tue Jan 15 02:08:01 2008
++++ bzrlib/diff.py Sun Feb  3 11:33:31 2008
+@@ -173,7 +173,7 @@ def external_diff(old_filename, oldlines, new_filename
 
          if not diff_opts:
              diff_opts = []
Index: patches/patch-bzrlib_patch_py
===================================================================
RCS file: patches/patch-bzrlib_patch_py
diff -N patches/patch-bzrlib_patch_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bzrlib_patch_py 3 Apr 2008 21:21:11 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- bzrlib/patch.py.orig Thu Mar 20 03:12:09 2008
++++ bzrlib/patch.py Wed Apr  2 23:11:25 2008
+@@ -65,7 +65,7 @@ def patch(patch_contents, filename, output_filename=No
+     :type reverse: bool
+     :return: 0 on success, 1 if some hunks failed
+     """
+-    args = ["patch", "-f", "-s", "--posix", "--binary"]
++    args = ["patch", "-f", "-s", "--posix"]
+     if reverse:
+         args.append("--reverse")
+     if output_filename is not None:
+@@ -81,7 +81,7 @@ def diff3(out_file, mine_path, older_path, yours_path)
+     check_text_path(mine_path)
+     check_text_path(older_path)
+     check_text_path(yours_path)
+-    args = ['diff3', "-E", "--merge"]
++    args = ['gdiff3', "-E", "--merge"]
+     add_label(args, "TREE")
+     add_label(args, "ANCESTOR")
+     add_label(args, "MERGE-SOURCE")
Index: patches/patch-bzrlib_tests_test_diff_py
===================================================================
RCS file: patches/patch-bzrlib_tests_test_diff_py
diff -N patches/patch-bzrlib_tests_test_diff_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bzrlib_tests_test_diff_py 3 Apr 2008 21:21:11 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- bzrlib/tests/test_diff.py.orig Thu Mar 20 03:12:10 2008
++++ bzrlib/tests/test_diff.py Wed Apr  2 22:52:46 2008
+@@ -270,7 +270,7 @@ class TestDiffFiles(TestCaseInTempDir):
+         # Make sure external_diff doesn't fail in the current LANG
+         lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
+
+-        cmd = ['diff', '-u', '--binary', 'old', 'new']
++        cmd = ['gdiff', '-u', 'old', 'new']
+         open('old', 'wb').write('\x00foobar\n')
+         open('new', 'wb').write('foo\x00bar\n')
+         pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+@@ -1257,7 +1257,7 @@ class TestDiffFromTool(TestCaseWithTransport):
+
+     def test_execute(self):
+         output = StringIO()
+-        diff_obj = DiffFromTool(['python', '-c',
++        diff_obj = DiffFromTool(['!!MODPY_BIN!!', '-c',
+                                  'print "%(old_path)s %(new_path)s"'],
+                                 None, None, output)
+         self.addCleanup(diff_obj.finish)
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/bzr/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 18 Mar 2007 20:05:28 -0000 1.1.1.1
+++ pkg/DESCR 3 Apr 2008 21:21:11 -0000
@@ -1,5 +1,5 @@
-Bazaar-NG allows you to keep old versions of files and directories,
-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.
-Bazaar-NG is written in Python.
+Bazaar-NG allows you to keep old versions of files and directories, 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.  Bazaar-NG is written in
+Python.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/bzr/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 Mar 2007 20:05:29 -0000 1.1.1.1
+++ pkg/PLIST 3 Apr 2008 21:21:11 -0000
@@ -1,12 +1,24 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2007/03/18 20:05:29 robert Exp $
 bin/bzr
+lib/python${MODPY_VERSION}/site-packages/bzr-1.3-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/bzrlib/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_dirstate_helpers_c.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_dirstate_helpers_py.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_dirstate_helpers_py.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_knit_load_data_c.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_knit_load_data_py.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_knit_load_data_py.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_patiencediff_c.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_patiencediff_py.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_patiencediff_py.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/add.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/add.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/annotate.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/annotate.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/api.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/api.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/atomicfile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/atomicfile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/
@@ -24,14 +36,20 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_checkout.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_commit.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_dirstate.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_dirstate.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_info.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_inventory.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_inventory.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_knit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_knit.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_log.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_log.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_osutils.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_osutils.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_rocks.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_rocks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_sftp.py
@@ -57,8 +75,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/many_commit.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/simple_many_commit.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/simple_many_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bisect_multi.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bisect_multi.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/branch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/branchbuilder.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/branchbuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/breakin.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/breakin.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bugtracker.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bugtracker.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/builtins.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/builtins.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/
@@ -70,8 +96,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/bundle_data.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/commands.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/commands.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/common.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/common.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/__init__.pyc
@@ -79,6 +103,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v08.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v09.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v09.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v4.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bzrdir.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bzrdir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/cache_utf8.py
@@ -95,14 +121,22 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/config.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/conflicts.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/conflicts.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/counted_lock.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/counted_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/debug.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/debug.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/decorators.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/decorators.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/delta.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/delta.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/deprecated_graph.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/deprecated_graph.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/diff.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/diff.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/directory_service.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/directory_service.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/dirstate.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/dirstate.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/__init__.pyc
@@ -111,6 +145,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/api/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/api/branch.txt
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/api/transport.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/email_message.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/email_message.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/errors.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/errors.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/export/
@@ -138,12 +174,22 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/hashcache.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/help.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/help.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/authentication.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/configuration.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/conflicts.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/hooks.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/hooks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/hooks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/identitymap.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/identitymap.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/ignores.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/ignores.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/index.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/index.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/info.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/inspect_for_copy.py
@@ -170,24 +216,34 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lockdir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/log.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/log.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/lru_cache.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/lru_cache.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lsprof.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lsprof.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/mail_client.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/mail_client.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/memorytree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/memorytree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge3.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge3.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/merge_directive.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/merge_directive.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/missing.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/missing.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/msgeditor.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/msgeditor.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/multiparent.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/multiparent.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/mutabletree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/mutabletree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/option.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/option.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/osutils.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/osutils.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/patch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/patch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/patches.py
@@ -202,16 +258,39 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/account.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/account.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_directory.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_directory.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_registration.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_registration.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_account.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_account.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_directory.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_directory.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_service.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_service.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_register.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_register.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/progress.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/progress.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/reconcile.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/reconfigure.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/reconfigure.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/registry.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/registry.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/remote.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/remote.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/knitrepo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/knitrepo.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/pack_repo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/pack_repo.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/weaverepo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/weaverepo.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/revision.py
@@ -226,6 +305,29 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/shellcomplete.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/sign_my_commits.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/sign_my_commits.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/branch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/bzrdir.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/bzrdir.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/client.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/client.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/medium.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/medium.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/protocol.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/protocol.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/repository.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/repository.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/request.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/request.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/server.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/server.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/vfs.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/vfs.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smtp_connection.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smtp_connection.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/status.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/status.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/store/
@@ -243,17 +345,19 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/store/versioned/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/store/versioned/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/store/versioned/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/strace.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/strace.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/switch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/switch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/symbol_versioning.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/symbol_versioning.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tag.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tag.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/testament.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/testament.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/EncodingAdapter.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/EncodingAdapter.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/HTTPTestUtil.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/HTTPTestUtil.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/HttpServer.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/HttpServer.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/TestUtil.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/TestUtil.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/__init__.py
@@ -277,10 +381,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_branch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_break_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_break_lock.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_breakin.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_breakin.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle_info.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat_revision.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat_revision.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_check.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_check.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_checkout.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_checkout.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_command_encoding.py
@@ -301,6 +411,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_find_merge_base.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_help.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_help.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_hooks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_hooks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ignore.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ignore.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ignored.py
@@ -311,6 +423,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_init.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_inventory.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_inventory.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_join.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_join.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_locale.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_locale.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_log.py
@@ -319,8 +433,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_logformats.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ls.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ls.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_lsprof.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_lsprof.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_merge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_merge.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_merge_directive.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_merge_directive.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_missing.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_missing.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_mv.py
@@ -331,6 +449,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_non_ascii.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_outside_wt.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_outside_wt.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_pull.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_pull.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_push.py
@@ -339,6 +459,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_re_sign.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconcile.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconfigure.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconfigure.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remerge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remerge.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remove.py
@@ -355,24 +477,36 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_revno.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_selftest.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_selftest.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_send.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_send.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_serve.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_serve.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_shared_repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_shared_repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_sign_my_commits.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_sign_my_commits.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_split.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_split.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_status.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_status.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_switch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_switch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_tags.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_tags.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_testament.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_testament.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_too_much.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_too_much.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_uncommit.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_uncommit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_unknowns.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_unknowns.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_update.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_update.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_upgrade.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_upgrade.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_version.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_version.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_version_info.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_version_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_versioning.py
@@ -388,8 +522,18 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_branch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_break_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_break_lock.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_commit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_create_checkout.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_create_checkout.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_hooks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_hooks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_http.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_http.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_last_revision_info.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_last_revision_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_locking.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_locking.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_parent.py
@@ -398,6 +542,18 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_permissions.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_pull.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_pull.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_push.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_push.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_revision_history.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_revision_history.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_revision_id_to_revno.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_sprout.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_sprout.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_tags.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_tags.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_uncommit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_uncommit.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_update.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_update.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/bzrdir_implementations/
@@ -405,6 +561,37 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/bzrdir_implementations/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/bzrdir_implementations/test_bzrdir.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_branch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_cat.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_cat.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_checkout.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_checkout.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_commit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_init.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_init.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_init_repository.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_init_repository.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_merge.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_merge.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_missing.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_missing.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_pull.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_pull.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_push.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_push.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_update.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_update.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ftp_server.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ftp_server.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/http_server.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/http_server.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/http_utils.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/http_utils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interrepository_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interrepository_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interrepository_implementations/__init__.pyc
@@ -420,23 +607,61 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interversionedfile_implementations/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interversionedfile_implementations/test_join.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interversionedfile_implementations/test_join.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/basics.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/basics.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/lock_helpers.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/lock_helpers.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/test_lock.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/test_lock.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/test_temporary_write_lock.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/test_temporary_write_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/helpers.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/helpers.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test__generate_text_key_index.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test__generate_text_key_index.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_break_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_break_lock.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_check.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_check.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_check_reconcile.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_check_reconcile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_commit_builder.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_commit_builder.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_fetch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_fetch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_fileid_involved.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_fileid_involved.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_find_text_key_references.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_find_text_key_references.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_has_revisions.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_has_revisions.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_has_same_location.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_has_same_location.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_is_write_locked.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_is_write_locked.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_reconcile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_revision.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_revision.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_statistics.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_statistics.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_write_group.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_write_group.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/revisionstore_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/revisionstore_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/revisionstore_implementations/__init__.pyc
@@ -444,6 +669,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/revisionstore_implementations/test_all.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/stub_sftp.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/stub_sftp.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__dirstate_helpers.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__dirstate_helpers.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ancestry.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ancestry.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_annotate.py
@@ -454,8 +681,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_atomicfile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bad_files.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bad_files.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bisect_multi.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bisect_multi.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_branch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_branchbuilder.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_branchbuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bugtracker.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bugtracker.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bundle.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bzrdir.py
@@ -472,16 +705,28 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_config.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_conflicts.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_conflicts.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_counted_lock.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_counted_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_decorators.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_decorators.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_delta.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_delta.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_deprecated_graph.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_deprecated_graph.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_diff.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_diff.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_doc_generate.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_doc_generate.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_directory_service.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_directory_service.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_dirstate.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_dirstate.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_email_message.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_email_message.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_errors.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_errors.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_escaped_store.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_escaped_store.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_extract.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_extract.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_fetch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_fetch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ftp_transport.py
@@ -498,14 +743,26 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_graph.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_hashcache.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_hashcache.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_help.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_help.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_hooks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_hooks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_implementations.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_implementations.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_response.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_response.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_https_ca_bundle.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_https_ca_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_identitymap.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_identitymap.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ignores.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ignores.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_index.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_index.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_info.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_inv.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_inv.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_knit.py
@@ -520,6 +777,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lockdir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_log.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_log.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lru_cache.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lru_cache.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lsprof.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lsprof.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_mail_client.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_mail_client.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_memorytree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_memorytree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge.py
@@ -528,10 +791,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge3.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_core.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_core.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_directive.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_directive.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_missing.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_missing.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_msgeditor.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_msgeditor.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_multiparent.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_multiparent.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_nonascii.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_nonascii.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_options.py
@@ -540,6 +807,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_osutils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_osutils_encodings.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_osutils_encodings.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_patch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_patch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_patches.py
@@ -575,8 +844,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_read_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconcile.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconfigure.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconfigure.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_registry.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_registry.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_remote.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_remote.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_revert.py
@@ -597,24 +870,40 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_setup.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_sftp_transport.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_sftp_transport.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart_add.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart_add.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart_transport.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart_transport.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smtp_connection.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smtp_connection.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_source.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_source.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ssh_transport.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ssh_transport.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_status.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_status.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_store.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_store.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_strace.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_strace.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_subsume.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_subsume.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_switch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_switch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_symbol_versioning.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_symbol_versioning.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_tag.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_tag.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_testament.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_testament.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textfile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textfile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textmerge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textmerge.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_timestamp.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_timestamp.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_trace.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_trace.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_transactions.py
@@ -649,26 +938,56 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_weave.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_whitebox.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_whitebox.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_win32utils.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_win32utils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_workingtree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_workingtree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_workingtree_4.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_workingtree_4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_wsgi.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_wsgi.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_xml.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_xml.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/transport_util.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/transport_util.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_annotate_iter.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_annotate_iter.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_file_mtime.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_root_id.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_root_id.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_symlink_target.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_symlink_target.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_inv.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_inv.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_list_files.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_list_files.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_path_content_summary.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_path_content_summary.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_revision_tree.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_revision_tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_test_trees.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_test_trees.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_tree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_tree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_walkdirs.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_walkdirs.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/treeshape.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/treeshape.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_add.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_add.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_add_reference.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_add_reference.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_basis_inventory.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_basis_tree.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_basis_tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_break_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_break_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_changes_from.py
@@ -679,8 +998,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_executable.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_flush.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_flush.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_get_file_mtime.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_inv.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_inv.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_is_ignored.py
@@ -691,8 +1014,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_merge_from_branch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_mkdir.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_mkdir.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_move.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_move.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_nested_specifics.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_parents.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_parents.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_paths2ids.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_paths2ids.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_pull.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_pull.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_put_file.py
@@ -701,10 +1030,22 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_readonly.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_readonly.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_remove.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_remove.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_rename_one.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_rename_one.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_revision_tree.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_revision_tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_set_root_id.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_set_root_id.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_smart_add.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_smart_add.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_uncommit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_uncommit.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_unversion.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_unversion.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_walkdirs.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_walkdirs.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_workingtree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textfile.py
@@ -715,6 +1056,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textmerge.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textui.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textui.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/timestamp.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/timestamp.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/trace.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/trace.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transactions.py
@@ -724,6 +1067,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/brokenrename.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/brokenrename.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/chroot.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/chroot.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/decorator.py
@@ -739,12 +1084,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_pycurl.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_pycurl.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_pycurl_errors.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_pycurl_errors.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_urllib.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_urllib.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_urllib2_wrappers.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_urllib2_wrappers.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/ca_bundle.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/ca_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/response.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/response.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/wsgi.py
@@ -755,12 +1100,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/memory.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/readonly.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/readonly.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/remote.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/remote.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/sftp.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/sftp.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/smart.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/smart.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/ssh.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/ssh.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/trace.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/trace.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/unlistable.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/unlistable.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/treebuilder.py
@@ -783,6 +1132,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/bencode.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/bencode.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/configobj/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/configobj/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/configobj/__init__.pyc
@@ -805,11 +1156,20 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/elementtree/ElementTree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/elementtree/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/elementtree/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/simplemapi.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/simplemapi.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/test_bencode.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/test_bencode.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_custom.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_custom.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_python.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_python.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_rio.py
@@ -822,16 +1182,20 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/weave_commands.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/weavefile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/weavefile.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/win32console.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/win32console.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/win32utils.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/win32utils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree_4.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree_4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml4.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml5.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml5.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml6.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml6.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/xml7.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/xml7.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml_serializer.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml_serializer.pyc
 @man man/man1/bzr.1

Reply | Threaded
Open this post in threaded view
|

Re: update: devel/bzr

Okan Demirmen
On Thu 2008.04.03 at 17:26 -0400, Okan Demirmen wrote:
> for those interested in bzr, here's a long awaited update to 1.3.
>
> basically, the 10k+ tests pass except 2, but those seem to be python
> related rather that bzr (beware of the ulimit -n comment if you want to
> do regress).
>
> commentss, tests, ok's welcome.

based on feedback from Valery Masiutsin, expat module is super
convenient - thanks!

new patch.

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/bzr/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 8 Oct 2007 08:22:39 -0000 1.3
+++ Makefile 9 Apr 2008 16:38:25 -0000
@@ -4,8 +4,7 @@ SHARED_ONLY= Yes
 
 COMMENT= distributed version control system by Canonical
 
-DISTNAME= bzr-0.14
-PKGNAME= ${DISTNAME}p0
+DISTNAME= bzr-1.3
 CATEGORIES= devel
 
 HOMEPAGE= http://bazaar-vcs.org/
@@ -20,10 +19,19 @@ MASTER_SITES= ${HOMEPAGE}releases/src/
 
 MODULES= lang/python
 
-RUN_DEPENDS= ::textproc/py-cElementTree \
+RUN_DEPENDS+= ::lang/python/${MODPY_VERSION},-bz2 \
+ ::lang/python/${MODPY_VERSION},-expat \
+ ::net/py-curl \
+ ::security/py-paramiko \
  ::textproc/gdiff
+
 REGRESS_DEPENDS=${RUN_DEPENDS}
 
+pre-configure:
+ @perl -pi -e s,!!MODPY_BIN!!,${MODPY_BIN}, ${WRKSRC}/bzr \
+ ${WRKSRC}/Makefile ${WRKSRC}/bzrlib/tests/test_diff.py
+
+# need at least ulimit -n 512
 do-regress:
  @cd ${WRKBUILD} && ./bzr selftest
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/bzr/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 5 Apr 2007 15:37:52 -0000 1.2
+++ distinfo 9 Apr 2008 16:38:25 -0000
@@ -1,5 +1,5 @@
-MD5 (bzr-0.14.tar.gz) = KBx3fzd8wUm2umDHIPcAMw==
-RMD160 (bzr-0.14.tar.gz) = 91zTfjwtMP/EgvIVzWDEfuOS804=
-SHA1 (bzr-0.14.tar.gz) = kMYnizMvNpWFym20e2XE58YNam8=
-SHA256 (bzr-0.14.tar.gz) = wcRyNumFsRBp/UMqMnz/tdLeWvQDXfIrQ08k2RbkdJ8=
-SIZE (bzr-0.14.tar.gz) = 1159335
+MD5 (bzr-1.3.tar.gz) = GvIzxvoKaIUbxhVbL1Y8MA==
+RMD160 (bzr-1.3.tar.gz) = 5758kORIvyLsWMgRUFxt0VGafks=
+SHA1 (bzr-1.3.tar.gz) = 5qkqsKv+VL/A+kkvEdxlu3Way0c=
+SHA256 (bzr-1.3.tar.gz) = Ra4dILigyx1FBEPZaftRdbkLxebhg6ZUhJNs+L4Ea3w=
+SIZE (bzr-1.3.tar.gz) = 3477457
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile 9 Apr 2008 16:38:25 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.orig Wed Apr  2 16:23:23 2008
++++ Makefile Wed Apr  2 16:24:06 2008
+@@ -20,7 +20,7 @@
+
+ ### Core Stuff ###
+
+-PYTHON=python
++PYTHON=!!MODPY_BIN!!
+
+ .PHONY: all clean extensions pyflakes api-docs
+
Index: patches/patch-bzr
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzr,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bzr
--- patches/patch-bzr 18 Mar 2007 20:05:28 -0000 1.1.1.1
+++ patches/patch-bzr 9 Apr 2008 16:38:25 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-bzr,v 1.1.1.1 2007/03/18 20:05:28 robert Exp $
---- bzr.orig Sun Mar 18 20:24:27 2007
-+++ bzr Sun Mar 18 20:24:42 2007
+--- bzr.orig Thu Mar 20 03:12:09 2008
++++ bzr Tue Apr  1 20:44:37 2008
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
-+#! /usr/bin/env python2.4
++#! !!MODPY_BIN!!
 
- # Copyright (C) 2005, 2006 Canonical Ltd
+ # Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
  #
Index: patches/patch-bzrlib_diff_py
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_diff_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bzrlib_diff_py
--- patches/patch-bzrlib_diff_py 18 Mar 2007 20:05:28 -0000 1.1.1.1
+++ patches/patch-bzrlib_diff_py 9 Apr 2008 16:38:25 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-bzrlib_diff_py,v 1.1.1.1 2007/03/18 20:05:28 robert Exp $
---- bzrlib/diff.py.orig Sun Mar 18 20:30:35 2007
-+++ bzrlib/diff.py Sun Mar 18 20:31:07 2007
-@@ -165,7 +165,7 @@ def external_diff(old_filename, oldlines
+--- bzrlib/diff.py.orig Tue Jan 15 02:08:01 2008
++++ bzrlib/diff.py Sun Feb  3 11:33:31 2008
+@@ -173,7 +173,7 @@ def external_diff(old_filename, oldlines, new_filename
 
          if not diff_opts:
              diff_opts = []
Index: patches/patch-bzrlib_patch_py
===================================================================
RCS file: patches/patch-bzrlib_patch_py
diff -N patches/patch-bzrlib_patch_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bzrlib_patch_py 9 Apr 2008 16:38:25 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- bzrlib/patch.py.orig Thu Mar 20 03:12:09 2008
++++ bzrlib/patch.py Wed Apr  2 23:11:25 2008
+@@ -65,7 +65,7 @@ def patch(patch_contents, filename, output_filename=No
+     :type reverse: bool
+     :return: 0 on success, 1 if some hunks failed
+     """
+-    args = ["patch", "-f", "-s", "--posix", "--binary"]
++    args = ["patch", "-f", "-s", "--posix"]
+     if reverse:
+         args.append("--reverse")
+     if output_filename is not None:
+@@ -81,7 +81,7 @@ def diff3(out_file, mine_path, older_path, yours_path)
+     check_text_path(mine_path)
+     check_text_path(older_path)
+     check_text_path(yours_path)
+-    args = ['diff3', "-E", "--merge"]
++    args = ['gdiff3', "-E", "--merge"]
+     add_label(args, "TREE")
+     add_label(args, "ANCESTOR")
+     add_label(args, "MERGE-SOURCE")
Index: patches/patch-bzrlib_tests_test_diff_py
===================================================================
RCS file: patches/patch-bzrlib_tests_test_diff_py
diff -N patches/patch-bzrlib_tests_test_diff_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bzrlib_tests_test_diff_py 9 Apr 2008 16:38:25 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- bzrlib/tests/test_diff.py.orig Thu Mar 20 03:12:10 2008
++++ bzrlib/tests/test_diff.py Wed Apr  2 22:52:46 2008
+@@ -270,7 +270,7 @@ class TestDiffFiles(TestCaseInTempDir):
+         # Make sure external_diff doesn't fail in the current LANG
+         lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
+
+-        cmd = ['diff', '-u', '--binary', 'old', 'new']
++        cmd = ['gdiff', '-u', 'old', 'new']
+         open('old', 'wb').write('\x00foobar\n')
+         open('new', 'wb').write('foo\x00bar\n')
+         pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+@@ -1257,7 +1257,7 @@ class TestDiffFromTool(TestCaseWithTransport):
+
+     def test_execute(self):
+         output = StringIO()
+-        diff_obj = DiffFromTool(['python', '-c',
++        diff_obj = DiffFromTool(['!!MODPY_BIN!!', '-c',
+                                  'print "%(old_path)s %(new_path)s"'],
+                                 None, None, output)
+         self.addCleanup(diff_obj.finish)
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/bzr/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 18 Mar 2007 20:05:28 -0000 1.1.1.1
+++ pkg/DESCR 9 Apr 2008 16:38:25 -0000
@@ -1,5 +1,5 @@
-Bazaar-NG allows you to keep old versions of files and directories,
-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.
-Bazaar-NG is written in Python.
+Bazaar-NG allows you to keep old versions of files and directories, 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.  Bazaar-NG is written in
+Python.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/bzr/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 Mar 2007 20:05:29 -0000 1.1.1.1
+++ pkg/PLIST 9 Apr 2008 16:38:25 -0000
@@ -1,12 +1,24 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2007/03/18 20:05:29 robert Exp $
 bin/bzr
+lib/python${MODPY_VERSION}/site-packages/bzr-1.3-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/bzrlib/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_dirstate_helpers_c.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_dirstate_helpers_py.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_dirstate_helpers_py.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_knit_load_data_c.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_knit_load_data_py.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_knit_load_data_py.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_patiencediff_c.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_patiencediff_py.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_patiencediff_py.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/add.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/add.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/annotate.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/annotate.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/api.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/api.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/atomicfile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/atomicfile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/
@@ -24,14 +36,20 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_checkout.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_commit.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_dirstate.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_dirstate.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_info.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_inventory.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_inventory.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_knit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_knit.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_log.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_log.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_osutils.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_osutils.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_rocks.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_rocks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_sftp.py
@@ -57,8 +75,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/many_commit.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/simple_many_commit.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/simple_many_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bisect_multi.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bisect_multi.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/branch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/branchbuilder.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/branchbuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/breakin.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/breakin.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bugtracker.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bugtracker.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/builtins.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/builtins.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/
@@ -70,8 +96,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/bundle_data.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/commands.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/commands.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/common.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/common.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/__init__.pyc
@@ -79,6 +103,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v08.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v09.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v09.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v4.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bzrdir.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bzrdir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/cache_utf8.py
@@ -95,14 +121,22 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/config.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/conflicts.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/conflicts.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/counted_lock.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/counted_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/debug.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/debug.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/decorators.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/decorators.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/delta.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/delta.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/deprecated_graph.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/deprecated_graph.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/diff.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/diff.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/directory_service.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/directory_service.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/dirstate.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/dirstate.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/__init__.pyc
@@ -111,6 +145,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/api/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/api/branch.txt
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/api/transport.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/email_message.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/email_message.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/errors.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/errors.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/export/
@@ -138,12 +174,22 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/hashcache.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/help.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/help.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/authentication.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/configuration.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/conflicts.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/hooks.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/hooks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/hooks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/identitymap.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/identitymap.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/ignores.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/ignores.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/index.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/index.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/info.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/inspect_for_copy.py
@@ -170,24 +216,34 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lockdir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/log.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/log.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/lru_cache.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/lru_cache.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lsprof.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lsprof.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/mail_client.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/mail_client.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/memorytree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/memorytree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge3.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge3.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/merge_directive.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/merge_directive.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/missing.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/missing.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/msgeditor.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/msgeditor.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/multiparent.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/multiparent.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/mutabletree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/mutabletree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/option.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/option.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/osutils.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/osutils.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/patch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/patch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/patches.py
@@ -202,16 +258,39 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/account.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/account.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_directory.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_directory.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_registration.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_registration.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_account.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_account.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_directory.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_directory.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_service.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_service.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_register.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_register.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/progress.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/progress.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/reconcile.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/reconfigure.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/reconfigure.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/registry.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/registry.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/remote.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/remote.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/knitrepo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/knitrepo.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/pack_repo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/pack_repo.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/weaverepo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/weaverepo.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/revision.py
@@ -226,6 +305,29 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/shellcomplete.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/sign_my_commits.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/sign_my_commits.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/branch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/bzrdir.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/bzrdir.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/client.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/client.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/medium.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/medium.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/protocol.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/protocol.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/repository.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/repository.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/request.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/request.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/server.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/server.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/vfs.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/vfs.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smtp_connection.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smtp_connection.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/status.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/status.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/store/
@@ -243,17 +345,19 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/store/versioned/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/store/versioned/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/store/versioned/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/strace.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/strace.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/switch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/switch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/symbol_versioning.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/symbol_versioning.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tag.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tag.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/testament.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/testament.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/EncodingAdapter.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/EncodingAdapter.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/HTTPTestUtil.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/HTTPTestUtil.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/HttpServer.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/HttpServer.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/TestUtil.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/TestUtil.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/__init__.py
@@ -277,10 +381,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_branch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_break_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_break_lock.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_breakin.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_breakin.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle_info.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat_revision.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat_revision.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_check.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_check.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_checkout.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_checkout.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_command_encoding.py
@@ -301,6 +411,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_find_merge_base.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_help.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_help.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_hooks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_hooks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ignore.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ignore.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ignored.py
@@ -311,6 +423,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_init.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_inventory.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_inventory.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_join.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_join.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_locale.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_locale.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_log.py
@@ -319,8 +433,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_logformats.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ls.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ls.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_lsprof.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_lsprof.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_merge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_merge.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_merge_directive.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_merge_directive.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_missing.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_missing.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_mv.py
@@ -331,6 +449,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_non_ascii.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_outside_wt.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_outside_wt.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_pull.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_pull.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_push.py
@@ -339,6 +459,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_re_sign.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconcile.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconfigure.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconfigure.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remerge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remerge.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remove.py
@@ -355,24 +477,36 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_revno.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_selftest.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_selftest.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_send.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_send.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_serve.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_serve.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_shared_repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_shared_repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_sign_my_commits.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_sign_my_commits.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_split.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_split.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_status.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_status.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_switch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_switch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_tags.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_tags.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_testament.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_testament.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_too_much.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_too_much.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_uncommit.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_uncommit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_unknowns.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_unknowns.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_update.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_update.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_upgrade.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_upgrade.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_version.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_version.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_version_info.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_version_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_versioning.py
@@ -388,8 +522,18 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_branch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_break_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_break_lock.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_commit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_create_checkout.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_create_checkout.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_hooks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_hooks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_http.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_http.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_last_revision_info.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_last_revision_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_locking.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_locking.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_parent.py
@@ -398,6 +542,18 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_permissions.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_pull.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_pull.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_push.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_push.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_revision_history.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_revision_history.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_revision_id_to_revno.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_sprout.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_sprout.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_tags.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_tags.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_uncommit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_uncommit.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_update.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_update.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/bzrdir_implementations/
@@ -405,6 +561,37 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/bzrdir_implementations/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/bzrdir_implementations/test_bzrdir.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_branch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_cat.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_cat.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_checkout.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_checkout.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_commit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_init.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_init.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_init_repository.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_init_repository.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_merge.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_merge.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_missing.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_missing.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_pull.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_pull.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_push.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_push.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_update.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_update.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ftp_server.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ftp_server.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/http_server.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/http_server.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/http_utils.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/http_utils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interrepository_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interrepository_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interrepository_implementations/__init__.pyc
@@ -420,23 +607,61 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interversionedfile_implementations/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interversionedfile_implementations/test_join.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interversionedfile_implementations/test_join.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/basics.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/basics.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/lock_helpers.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/lock_helpers.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/test_lock.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/test_lock.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/test_temporary_write_lock.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/test_temporary_write_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/helpers.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/helpers.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test__generate_text_key_index.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test__generate_text_key_index.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_break_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_break_lock.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_check.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_check.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_check_reconcile.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_check_reconcile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_commit_builder.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_commit_builder.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_fetch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_fetch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_fileid_involved.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_fileid_involved.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_find_text_key_references.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_find_text_key_references.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_has_revisions.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_has_revisions.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_has_same_location.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_has_same_location.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_is_write_locked.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_is_write_locked.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_reconcile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_revision.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_revision.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_statistics.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_statistics.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_write_group.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_write_group.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/revisionstore_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/revisionstore_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/revisionstore_implementations/__init__.pyc
@@ -444,6 +669,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/revisionstore_implementations/test_all.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/stub_sftp.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/stub_sftp.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__dirstate_helpers.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__dirstate_helpers.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ancestry.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ancestry.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_annotate.py
@@ -454,8 +681,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_atomicfile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bad_files.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bad_files.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bisect_multi.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bisect_multi.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_branch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_branchbuilder.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_branchbuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bugtracker.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bugtracker.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bundle.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bzrdir.py
@@ -472,16 +705,28 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_config.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_conflicts.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_conflicts.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_counted_lock.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_counted_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_decorators.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_decorators.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_delta.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_delta.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_deprecated_graph.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_deprecated_graph.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_diff.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_diff.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_doc_generate.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_doc_generate.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_directory_service.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_directory_service.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_dirstate.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_dirstate.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_email_message.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_email_message.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_errors.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_errors.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_escaped_store.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_escaped_store.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_extract.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_extract.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_fetch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_fetch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ftp_transport.py
@@ -498,14 +743,26 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_graph.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_hashcache.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_hashcache.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_help.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_help.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_hooks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_hooks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_implementations.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_implementations.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_response.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_response.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_https_ca_bundle.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_https_ca_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_identitymap.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_identitymap.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ignores.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ignores.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_index.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_index.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_info.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_inv.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_inv.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_knit.py
@@ -520,6 +777,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lockdir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_log.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_log.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lru_cache.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lru_cache.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lsprof.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lsprof.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_mail_client.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_mail_client.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_memorytree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_memorytree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge.py
@@ -528,10 +791,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge3.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_core.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_core.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_directive.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_directive.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_missing.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_missing.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_msgeditor.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_msgeditor.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_multiparent.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_multiparent.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_nonascii.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_nonascii.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_options.py
@@ -540,6 +807,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_osutils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_osutils_encodings.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_osutils_encodings.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_patch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_patch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_patches.py
@@ -575,8 +844,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_read_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconcile.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconfigure.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconfigure.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_registry.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_registry.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_remote.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_remote.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_revert.py
@@ -597,24 +870,40 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_setup.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_sftp_transport.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_sftp_transport.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart_add.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart_add.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart_transport.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart_transport.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smtp_connection.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smtp_connection.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_source.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_source.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ssh_transport.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ssh_transport.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_status.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_status.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_store.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_store.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_strace.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_strace.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_subsume.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_subsume.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_switch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_switch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_symbol_versioning.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_symbol_versioning.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_tag.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_tag.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_testament.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_testament.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textfile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textfile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textmerge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textmerge.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_timestamp.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_timestamp.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_trace.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_trace.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_transactions.py
@@ -649,26 +938,56 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_weave.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_whitebox.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_whitebox.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_win32utils.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_win32utils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_workingtree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_workingtree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_workingtree_4.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_workingtree_4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_wsgi.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_wsgi.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_xml.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_xml.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/transport_util.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/transport_util.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_annotate_iter.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_annotate_iter.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_file_mtime.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_root_id.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_root_id.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_symlink_target.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_symlink_target.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_inv.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_inv.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_list_files.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_list_files.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_path_content_summary.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_path_content_summary.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_revision_tree.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_revision_tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_test_trees.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_test_trees.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_tree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_tree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_walkdirs.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_walkdirs.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/treeshape.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/treeshape.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_add.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_add.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_add_reference.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_add_reference.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_basis_inventory.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_basis_tree.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_basis_tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_break_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_break_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_changes_from.py
@@ -679,8 +998,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_executable.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_flush.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_flush.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_get_file_mtime.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_inv.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_inv.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_is_ignored.py
@@ -691,8 +1014,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_merge_from_branch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_mkdir.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_mkdir.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_move.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_move.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_nested_specifics.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_parents.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_parents.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_paths2ids.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_paths2ids.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_pull.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_pull.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_put_file.py
@@ -701,10 +1030,22 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_readonly.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_readonly.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_remove.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_remove.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_rename_one.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_rename_one.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_revision_tree.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_revision_tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_set_root_id.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_set_root_id.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_smart_add.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_smart_add.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_uncommit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_uncommit.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_unversion.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_unversion.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_walkdirs.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_walkdirs.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_workingtree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textfile.py
@@ -715,6 +1056,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textmerge.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textui.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textui.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/timestamp.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/timestamp.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/trace.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/trace.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transactions.py
@@ -724,6 +1067,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/brokenrename.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/brokenrename.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/chroot.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/chroot.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/decorator.py
@@ -739,12 +1084,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_pycurl.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_pycurl.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_pycurl_errors.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_pycurl_errors.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_urllib.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_urllib.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_urllib2_wrappers.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_urllib2_wrappers.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/ca_bundle.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/ca_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/response.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/response.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/wsgi.py
@@ -755,12 +1100,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/memory.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/readonly.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/readonly.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/remote.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/remote.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/sftp.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/sftp.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/smart.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/smart.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/ssh.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/ssh.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/trace.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/trace.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/unlistable.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/unlistable.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/treebuilder.py
@@ -783,6 +1132,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/bencode.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/bencode.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/configobj/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/configobj/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/configobj/__init__.pyc
@@ -805,11 +1156,20 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/elementtree/ElementTree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/elementtree/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/elementtree/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/simplemapi.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/simplemapi.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/test_bencode.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/test_bencode.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_custom.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_custom.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_python.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_python.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_rio.py
@@ -822,16 +1182,20 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/weave_commands.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/weavefile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/weavefile.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/win32console.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/win32console.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/win32utils.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/win32utils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree_4.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree_4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml4.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml5.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml5.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml6.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml6.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/xml7.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/xml7.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml_serializer.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml_serializer.pyc
 @man man/man1/bzr.1

Reply | Threaded
Open this post in threaded view
|

Re: update: devel/bzr

Marc Espie-2
On Wed, Apr 09, 2008 at 12:40:56PM -0400, Okan Demirmen wrote:
> +pre-configure:
> + @perl -pi -e s,!!MODPY_BIN!!,${MODPY_BIN}, ${WRKSRC}/bzr \
> + ${WRKSRC}/Makefile ${WRKSRC}/bzrlib/tests/test_diff.py
> +

Check SUBST_CMD in bsd.port.mk(5)  (-current), it's precisely there
for this kind of stuff.

It might fuck up on Makefiles, but that's one location where you're probably
better off using MAKE_FLAGS and letting make do the substitution itself...

Reply | Threaded
Open this post in threaded view
|

Re: update: devel/bzr

Okan Demirmen
On Thu 2008.04.10 at 09:18 +0200, Marc Espie wrote:

> On Wed, Apr 09, 2008 at 12:40:56PM -0400, Okan Demirmen wrote:
> > +pre-configure:
> > + @perl -pi -e s,!!MODPY_BIN!!,${MODPY_BIN}, ${WRKSRC}/bzr \
> > + ${WRKSRC}/Makefile ${WRKSRC}/bzrlib/tests/test_diff.py
> > +
>
> Check SUBST_CMD in bsd.port.mk(5)  (-current), it's precisely there
> for this kind of stuff.
>
> It might fuck up on Makefiles, but that's one location where you're probably
> better off using MAKE_FLAGS and letting make do the substitution itself...

thanks - much nicer!

(some regress tests are still failing though...)

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/bzr/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 8 Oct 2007 08:22:39 -0000 1.3
+++ Makefile 11 Apr 2008 02:01:28 -0000
@@ -4,8 +4,7 @@ SHARED_ONLY= Yes
 
 COMMENT= distributed version control system by Canonical
 
-DISTNAME= bzr-0.14
-PKGNAME= ${DISTNAME}p0
+DISTNAME= bzr-1.3
 CATEGORIES= devel
 
 HOMEPAGE= http://bazaar-vcs.org/
@@ -20,11 +19,21 @@ MASTER_SITES= ${HOMEPAGE}releases/src/
 
 MODULES= lang/python
 
-RUN_DEPENDS= ::textproc/py-cElementTree \
+RUN_DEPENDS+= ::lang/python/${MODPY_VERSION},-bz2 \
+ ::lang/python/${MODPY_VERSION},-expat \
+ ::net/py-curl \
+ ::security/py-paramiko \
  ::textproc/gdiff
+
 REGRESS_DEPENDS=${RUN_DEPENDS}
 
+SUBST_VARS= MODPY_BIN
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/bzr ${WRKSRC}/bzrlib/tests/test_diff.py
+
+# need at least ulimit -n 512
 do-regress:
- @cd ${WRKBUILD} && ./bzr selftest
+ @cd ${WRKBUILD} && ${MODPY_BIN} ./bzr selftest
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/bzr/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 5 Apr 2007 15:37:52 -0000 1.2
+++ distinfo 11 Apr 2008 02:01:28 -0000
@@ -1,5 +1,5 @@
-MD5 (bzr-0.14.tar.gz) = KBx3fzd8wUm2umDHIPcAMw==
-RMD160 (bzr-0.14.tar.gz) = 91zTfjwtMP/EgvIVzWDEfuOS804=
-SHA1 (bzr-0.14.tar.gz) = kMYnizMvNpWFym20e2XE58YNam8=
-SHA256 (bzr-0.14.tar.gz) = wcRyNumFsRBp/UMqMnz/tdLeWvQDXfIrQ08k2RbkdJ8=
-SIZE (bzr-0.14.tar.gz) = 1159335
+MD5 (bzr-1.3.tar.gz) = GvIzxvoKaIUbxhVbL1Y8MA==
+RMD160 (bzr-1.3.tar.gz) = 5758kORIvyLsWMgRUFxt0VGafks=
+SHA1 (bzr-1.3.tar.gz) = 5qkqsKv+VL/A+kkvEdxlu3Way0c=
+SHA256 (bzr-1.3.tar.gz) = Ra4dILigyx1FBEPZaftRdbkLxebhg6ZUhJNs+L4Ea3w=
+SIZE (bzr-1.3.tar.gz) = 3477457
Index: patches/patch-bzr
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzr,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bzr
--- patches/patch-bzr 18 Mar 2007 20:05:28 -0000 1.1.1.1
+++ patches/patch-bzr 11 Apr 2008 02:01:28 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-bzr,v 1.1.1.1 2007/03/18 20:05:28 robert Exp $
---- bzr.orig Sun Mar 18 20:24:27 2007
-+++ bzr Sun Mar 18 20:24:42 2007
+--- bzr.orig Thu Mar 20 03:12:09 2008
++++ bzr Tue Apr  1 20:44:37 2008
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
-+#! /usr/bin/env python2.4
++#! ${MODPY_BIN}
 
- # Copyright (C) 2005, 2006 Canonical Ltd
+ # Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
  #
Index: patches/patch-bzrlib_diff_py
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_diff_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bzrlib_diff_py
--- patches/patch-bzrlib_diff_py 18 Mar 2007 20:05:28 -0000 1.1.1.1
+++ patches/patch-bzrlib_diff_py 11 Apr 2008 02:01:28 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-bzrlib_diff_py,v 1.1.1.1 2007/03/18 20:05:28 robert Exp $
---- bzrlib/diff.py.orig Sun Mar 18 20:30:35 2007
-+++ bzrlib/diff.py Sun Mar 18 20:31:07 2007
-@@ -165,7 +165,7 @@ def external_diff(old_filename, oldlines
+--- bzrlib/diff.py.orig Tue Jan 15 02:08:01 2008
++++ bzrlib/diff.py Sun Feb  3 11:33:31 2008
+@@ -173,7 +173,7 @@ def external_diff(old_filename, oldlines, new_filename
 
          if not diff_opts:
              diff_opts = []
Index: patches/patch-bzrlib_patch_py
===================================================================
RCS file: patches/patch-bzrlib_patch_py
diff -N patches/patch-bzrlib_patch_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bzrlib_patch_py 11 Apr 2008 02:01:28 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- bzrlib/patch.py.orig Thu Mar 20 03:12:09 2008
++++ bzrlib/patch.py Wed Apr  2 23:11:25 2008
+@@ -65,7 +65,7 @@ def patch(patch_contents, filename, output_filename=No
+     :type reverse: bool
+     :return: 0 on success, 1 if some hunks failed
+     """
+-    args = ["patch", "-f", "-s", "--posix", "--binary"]
++    args = ["patch", "-f", "-s", "--posix"]
+     if reverse:
+         args.append("--reverse")
+     if output_filename is not None:
+@@ -81,7 +81,7 @@ def diff3(out_file, mine_path, older_path, yours_path)
+     check_text_path(mine_path)
+     check_text_path(older_path)
+     check_text_path(yours_path)
+-    args = ['diff3', "-E", "--merge"]
++    args = ['gdiff3', "-E", "--merge"]
+     add_label(args, "TREE")
+     add_label(args, "ANCESTOR")
+     add_label(args, "MERGE-SOURCE")
Index: patches/patch-bzrlib_tests_test_diff_py
===================================================================
RCS file: patches/patch-bzrlib_tests_test_diff_py
diff -N patches/patch-bzrlib_tests_test_diff_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bzrlib_tests_test_diff_py 11 Apr 2008 02:01:28 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- bzrlib/tests/test_diff.py.orig Thu Mar 20 03:12:10 2008
++++ bzrlib/tests/test_diff.py Wed Apr  2 22:52:46 2008
+@@ -270,7 +270,7 @@ class TestDiffFiles(TestCaseInTempDir):
+         # Make sure external_diff doesn't fail in the current LANG
+         lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
+
+-        cmd = ['diff', '-u', '--binary', 'old', 'new']
++        cmd = ['gdiff', '-u', 'old', 'new']
+         open('old', 'wb').write('\x00foobar\n')
+         open('new', 'wb').write('foo\x00bar\n')
+         pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+@@ -1257,7 +1257,7 @@ class TestDiffFromTool(TestCaseWithTransport):
+
+     def test_execute(self):
+         output = StringIO()
+-        diff_obj = DiffFromTool(['python', '-c',
++        diff_obj = DiffFromTool(['${MODPY_BIN}', '-c',
+                                  'print "%(old_path)s %(new_path)s"'],
+                                 None, None, output)
+         self.addCleanup(diff_obj.finish)
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/bzr/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 18 Mar 2007 20:05:28 -0000 1.1.1.1
+++ pkg/DESCR 11 Apr 2008 02:01:28 -0000
@@ -1,5 +1,5 @@
-Bazaar-NG allows you to keep old versions of files and directories,
-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.
-Bazaar-NG is written in Python.
+Bazaar-NG allows you to keep old versions of files and directories, 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.  Bazaar-NG is written in
+Python.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/bzr/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 Mar 2007 20:05:29 -0000 1.1.1.1
+++ pkg/PLIST 11 Apr 2008 02:01:28 -0000
@@ -1,12 +1,24 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2007/03/18 20:05:29 robert Exp $
 bin/bzr
+lib/python${MODPY_VERSION}/site-packages/bzr-1.3-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/bzrlib/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_dirstate_helpers_c.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_dirstate_helpers_py.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_dirstate_helpers_py.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_knit_load_data_c.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_knit_load_data_py.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_knit_load_data_py.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_patiencediff_c.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_patiencediff_py.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_patiencediff_py.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/add.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/add.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/annotate.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/annotate.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/api.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/api.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/atomicfile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/atomicfile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/
@@ -24,14 +36,20 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_checkout.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_commit.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_dirstate.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_dirstate.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_info.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_inventory.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_inventory.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_knit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_knit.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_log.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_log.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_osutils.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_osutils.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_rocks.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_rocks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_sftp.py
@@ -57,8 +75,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/many_commit.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/simple_many_commit.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/simple_many_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bisect_multi.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bisect_multi.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/branch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/branchbuilder.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/branchbuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/breakin.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/breakin.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bugtracker.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bugtracker.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/builtins.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/builtins.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/
@@ -70,8 +96,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/bundle_data.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/commands.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/commands.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/common.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/common.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/__init__.pyc
@@ -79,6 +103,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v08.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v09.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v09.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v4.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/bundle/serializer/v4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bzrdir.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bzrdir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/cache_utf8.py
@@ -95,14 +121,22 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/config.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/conflicts.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/conflicts.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/counted_lock.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/counted_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/debug.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/debug.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/decorators.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/decorators.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/delta.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/delta.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/deprecated_graph.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/deprecated_graph.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/diff.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/diff.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/directory_service.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/directory_service.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/dirstate.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/dirstate.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/__init__.pyc
@@ -111,6 +145,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/api/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/api/branch.txt
 lib/python${MODPY_VERSION}/site-packages/bzrlib/doc/api/transport.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/email_message.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/email_message.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/errors.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/errors.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/export/
@@ -138,12 +174,22 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/hashcache.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/help.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/help.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/authentication.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/configuration.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/conflicts.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/hooks.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/hooks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/hooks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/identitymap.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/identitymap.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/ignores.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/ignores.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/index.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/index.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/info.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/inspect_for_copy.py
@@ -170,24 +216,34 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lockdir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/log.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/log.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/lru_cache.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/lru_cache.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lsprof.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lsprof.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/mail_client.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/mail_client.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/memorytree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/memorytree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge3.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/merge3.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/merge_directive.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/merge_directive.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/missing.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/missing.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/msgeditor.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/msgeditor.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/multiparent.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/multiparent.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/mutabletree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/mutabletree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/option.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/option.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/osutils.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/osutils.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/patch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/patch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/patches.py
@@ -202,16 +258,39 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/account.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/account.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_directory.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_directory.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_registration.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_registration.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_account.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_account.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_directory.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_directory.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_service.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_service.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_register.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_register.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/progress.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/progress.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/reconcile.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/reconfigure.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/reconfigure.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/registry.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/registry.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/remote.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/remote.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/knitrepo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/knitrepo.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/pack_repo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/pack_repo.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/weaverepo.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/repofmt/weaverepo.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/revision.py
@@ -226,6 +305,29 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/shellcomplete.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/sign_my_commits.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/sign_my_commits.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/branch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/bzrdir.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/bzrdir.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/client.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/client.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/medium.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/medium.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/protocol.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/protocol.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/repository.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/repository.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/request.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/request.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/server.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/server.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/vfs.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smart/vfs.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smtp_connection.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/smtp_connection.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/status.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/status.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/store/
@@ -243,17 +345,19 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/store/versioned/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/store/versioned/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/store/versioned/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/strace.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/strace.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/switch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/switch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/symbol_versioning.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/symbol_versioning.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tag.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tag.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/testament.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/testament.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/EncodingAdapter.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/EncodingAdapter.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/HTTPTestUtil.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/HTTPTestUtil.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/HttpServer.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/HttpServer.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/TestUtil.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/TestUtil.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/__init__.py
@@ -277,10 +381,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_branch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_break_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_break_lock.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_breakin.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_breakin.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle_info.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_bundle_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat_revision.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_cat_revision.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_check.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_check.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_checkout.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_checkout.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_command_encoding.py
@@ -301,6 +411,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_find_merge_base.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_help.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_help.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_hooks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_hooks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ignore.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ignore.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ignored.py
@@ -311,6 +423,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_init.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_inventory.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_inventory.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_join.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_join.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_locale.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_locale.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_log.py
@@ -319,8 +433,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_logformats.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ls.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_ls.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_lsprof.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_lsprof.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_merge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_merge.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_merge_directive.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_merge_directive.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_missing.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_missing.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_mv.py
@@ -331,6 +449,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_non_ascii.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_outside_wt.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_outside_wt.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_pull.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_pull.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_push.py
@@ -339,6 +459,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_re_sign.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconcile.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconfigure.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_reconfigure.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remerge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remerge.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_remove.py
@@ -355,24 +477,36 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_revno.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_selftest.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_selftest.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_send.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_send.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_serve.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_serve.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_shared_repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_shared_repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_sign_my_commits.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_sign_my_commits.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_split.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_split.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_status.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_status.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_switch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_switch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_tags.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_tags.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_testament.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_testament.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_too_much.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_too_much.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_uncommit.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_uncommit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_unknowns.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_unknowns.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_update.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_update.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_upgrade.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_upgrade.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_version.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_version.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_version_info.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_version_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_versioning.py
@@ -388,8 +522,18 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_branch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_break_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_break_lock.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_commit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_create_checkout.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_create_checkout.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_hooks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_hooks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_http.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_http.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_last_revision_info.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_last_revision_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_locking.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_locking.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_parent.py
@@ -398,6 +542,18 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_permissions.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_pull.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_pull.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_push.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_push.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_revision_history.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_revision_history.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_revision_id_to_revno.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_sprout.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_sprout.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_tags.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_tags.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_uncommit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_uncommit.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_update.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/branch_implementations/test_update.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/bzrdir_implementations/
@@ -405,6 +561,37 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/bzrdir_implementations/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/bzrdir_implementations/test_bzrdir.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_branch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_cat.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_cat.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_checkout.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_checkout.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_commit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_init.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_init.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_init_repository.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_init_repository.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_merge.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_merge.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_missing.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_missing.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_pull.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_pull.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_push.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_push.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_update.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_update.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ftp_server.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ftp_server.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/http_server.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/http_server.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/http_utils.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/http_utils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interrepository_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interrepository_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interrepository_implementations/__init__.pyc
@@ -420,23 +607,61 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interversionedfile_implementations/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interversionedfile_implementations/test_join.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/interversionedfile_implementations/test_join.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/basics.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/inventory_implementations/basics.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/lock_helpers.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/lock_helpers.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/test_lock.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/test_lock.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/test_temporary_write_lock.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_lock/test_temporary_write_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/helpers.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/helpers.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test__generate_text_key_index.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test__generate_text_key_index.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_break_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_break_lock.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_check.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_check.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_check_reconcile.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_check_reconcile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_commit_builder.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_commit_builder.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_fetch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_fetch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_fileid_involved.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_fileid_involved.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_find_text_key_references.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_find_text_key_references.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_has_revisions.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_has_revisions.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_has_same_location.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_has_same_location.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_is_write_locked.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_is_write_locked.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_reconcile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_revision.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_revision.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_statistics.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_statistics.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_write_group.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/repository_implementations/test_write_group.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/revisionstore_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/revisionstore_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/revisionstore_implementations/__init__.pyc
@@ -444,6 +669,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/revisionstore_implementations/test_all.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/stub_sftp.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/stub_sftp.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__dirstate_helpers.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__dirstate_helpers.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ancestry.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ancestry.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_annotate.py
@@ -454,8 +681,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_atomicfile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bad_files.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bad_files.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bisect_multi.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bisect_multi.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_branch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_branchbuilder.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_branchbuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bugtracker.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bugtracker.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bundle.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bzrdir.py
@@ -472,16 +705,28 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_config.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_conflicts.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_conflicts.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_counted_lock.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_counted_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_decorators.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_decorators.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_delta.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_delta.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_deprecated_graph.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_deprecated_graph.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_diff.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_diff.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_doc_generate.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_doc_generate.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_directory_service.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_directory_service.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_dirstate.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_dirstate.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_email_message.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_email_message.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_errors.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_errors.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_escaped_store.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_escaped_store.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_extract.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_extract.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_fetch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_fetch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ftp_transport.py
@@ -498,14 +743,26 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_graph.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_hashcache.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_hashcache.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_help.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_help.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_hooks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_hooks.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_implementations.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_implementations.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_response.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_http_response.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_https_ca_bundle.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_https_ca_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_identitymap.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_identitymap.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ignores.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ignores.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_index.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_index.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_info.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_inv.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_inv.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_knit.py
@@ -520,6 +777,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lockdir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_log.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_log.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lru_cache.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lru_cache.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lsprof.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lsprof.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_mail_client.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_mail_client.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_memorytree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_memorytree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge.py
@@ -528,10 +791,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge3.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_core.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_core.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_directive.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_merge_directive.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_missing.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_missing.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_msgeditor.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_msgeditor.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_multiparent.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_multiparent.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_nonascii.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_nonascii.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_options.py
@@ -540,6 +807,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_osutils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_osutils_encodings.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_osutils_encodings.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_pack.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_pack.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_patch.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_patch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_patches.py
@@ -575,8 +844,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_read_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconcile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconcile.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconfigure.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_reconfigure.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_registry.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_registry.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_remote.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_remote.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_revert.py
@@ -597,24 +870,40 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_setup.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_sftp_transport.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_sftp_transport.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart_add.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart_add.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart_transport.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smart_transport.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smtp_connection.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_smtp_connection.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_source.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_source.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ssh_transport.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ssh_transport.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_status.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_status.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_store.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_store.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_strace.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_strace.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_subsume.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_subsume.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_switch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_switch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_symbol_versioning.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_symbol_versioning.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_tag.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_tag.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_testament.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_testament.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textfile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textfile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textmerge.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_textmerge.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_timestamp.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_timestamp.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_trace.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_trace.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_transactions.py
@@ -649,26 +938,56 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_weave.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_whitebox.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_whitebox.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_win32utils.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_win32utils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_workingtree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_workingtree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_workingtree_4.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_workingtree_4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_wsgi.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_wsgi.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_xml.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_xml.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/transport_util.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/transport_util.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_annotate_iter.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_annotate_iter.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_file_mtime.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_root_id.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_root_id.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_symlink_target.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_get_symlink_target.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_inv.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_inv.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_list_files.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_list_files.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_path_content_summary.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_path_content_summary.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_revision_tree.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_revision_tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_test_trees.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_test_trees.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_tree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_tree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_walkdirs.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/tree_implementations/test_walkdirs.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/treeshape.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/treeshape.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_add.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_add.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_add_reference.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_add_reference.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_basis_inventory.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_basis_tree.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_basis_tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_break_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_break_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_changes_from.py
@@ -679,8 +998,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_executable.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_flush.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_flush.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_get_file_mtime.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_inv.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_inv.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_is_ignored.py
@@ -691,8 +1014,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_merge_from_branch.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_mkdir.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_mkdir.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_move.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_move.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_nested_specifics.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_parents.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_parents.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_paths2ids.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_paths2ids.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_pull.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_pull.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_put_file.py
@@ -701,10 +1030,22 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_read_working_inventory.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_readonly.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_readonly.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_remove.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_remove.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_rename_one.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_rename_one.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_revision_tree.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_revision_tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_set_root_id.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_set_root_id.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_smart_add.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_smart_add.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_uncommit.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_uncommit.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_unversion.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_unversion.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_walkdirs.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_walkdirs.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_workingtree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textfile.py
@@ -715,6 +1056,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textmerge.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textui.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textui.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/timestamp.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/timestamp.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/trace.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/trace.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transactions.py
@@ -724,6 +1067,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/brokenrename.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/brokenrename.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/chroot.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/chroot.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/decorator.py
@@ -739,12 +1084,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_pycurl.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_pycurl.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_pycurl_errors.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_pycurl_errors.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_urllib.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_urllib.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_urllib2_wrappers.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/_urllib2_wrappers.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/ca_bundle.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/ca_bundle.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/response.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/response.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/wsgi.py
@@ -755,12 +1100,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/memory.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/readonly.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/readonly.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/remote.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/remote.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/sftp.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/sftp.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/smart.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/smart.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/ssh.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/ssh.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/trace.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/trace.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/unlistable.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/unlistable.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/treebuilder.py
@@ -783,6 +1132,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/bencode.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/bencode.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/configobj/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/configobj/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/configobj/__init__.pyc
@@ -805,11 +1156,20 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/elementtree/ElementTree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/elementtree/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/util/elementtree/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/simplemapi.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/simplemapi.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/test_bencode.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/util/tests/test_bencode.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_custom.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_custom.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_python.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_python.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/version_info_formats/format_rio.py
@@ -822,16 +1182,20 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/weave_commands.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/weavefile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/weavefile.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/win32console.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/win32console.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/win32utils.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/win32utils.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree_4.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/workingtree_4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml4.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml4.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml5.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml5.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml6.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml6.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/xml7.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/xml7.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml_serializer.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/xml_serializer.pyc
 @man man/man1/bzr.1

Reply | Threaded
Open this post in threaded view
|

Re: update: devel/bzr

Toni Mueller-7

Hi,

sorry to chime in late, but I've only come to see this thread after
updating the port, which was at 0.14, to 1.5. Or at least, I think
so...

Anyway, please grab my attempt here:

http://www.oeko.net/download/sw/bsd/bzr.tar.gz

and send me feedback.

Some notes:

* The port was prepared on a stock 4.3 system.
* It requires Python 2.5. This is sub-elegant - in theory, supporting
  2.4 and 2.5 as flavours would be the right thing, but I was lazy.
* In the process, I found that gdiff seems to be no longer required, so
  I removed the requirement.

* The Python port itself has "WANTLIB... expat". This is also
  sub-elegant since libexpat is now in base.

* Hopefully, Python 2.3 can be dropped in the near future.

Btw, the release frequency of bzr has increased quite a bit over the
last few months...


Thank you!


Kind regards,
--Toni++

Reply | Threaded
Open this post in threaded view
|

Re: update: devel/bzr

Will Maier
On Wed, Jun 18, 2008 at 01:27:50PM +0200, Toni Mueller wrote:
> sorry to chime in late, but I've only come to see this thread
> after updating the port, which was at 0.14, to 1.5. Or at least, I
> think so...

The port is at 1.3 in -current.

> Anyway, please grab my attempt here:
>
> http://www.oeko.net/download/sw/bsd/bzr.tar.gz

For updates to existing ports, patches (produced by 'cvs diff -uNp')
are almost always easier to work with.

[...]
> * The port was prepared on a stock 4.3 system.

The ports tree is developed against -current. If you'd like to
submit updates, please get yourself a -current/snapshot system and
test your builds/generate your diffs on that.

> * It requires Python 2.5. This is sub-elegant - in theory,
> supporting 2.4 and 2.5 as flavours would be the right thing, but I
> was lazy.

Python 2.5 is the default version in use in the tree. New ports
shouldn't use 2.4 and aren't expected to build/function with it.

> * In the process, I found that gdiff seems to be no longer
> required, so I removed the requirement.
>
> * The Python port itself has "WANTLIB... expat". This is also
> sub-elegant since libexpat is now in base.

WANTLIB can include libraries present in the base system as well as
libraries installed by other ports.

> * Hopefully, Python 2.3 can be dropped in the near future.

If by 'dropped' you mean 'removed from the tree', I imagine this
will happen at some point (though it doesn't seem to be a pressing
issue).

Can you re-roll your update as a diff against -current? Thanks for
taking the time to improve the bzr port!

--

o--------------------------{ Will Maier }--------------------------o
| web:.......http://www.lfod.us/ | [hidden email] |
*---------------------[ BSD: Live Free or Die ]--------------------*

Reply | Threaded
Open this post in threaded view
|

Re: update: devel/bzr

Ingo Schwarze
Will Maier wrote on Wed, Jun 18, 2008 at 06:50:11AM -0500:
> On Wed, Jun 18, 2008 at 01:27:50PM +0200, Toni Mueller wrote:

>> * Hopefully, Python 2.3 can be dropped in the near future.
>
> If by 'dropped' you mean 'removed from the tree', I imagine this
> will happen at some point (though it doesn't seem to be a pressing
> issue).

Worse than that: Some people are forced to still run Python 2.3
in production (me too), however nice upgrading to 2.5 might be.
Being stuck with Zope 2.8 is one reason, and there are others.
This was discussed recently.

So hopefully, Python 2.3 will *not* be dropped in the near future.
On the other hand, even 2.5 will be dropped 'at some point'...  ;-)

Yours,
  Ingo