This is an update to bzr 2.2.2.

Eric.

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/bzr/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile    15 Nov 2010 19:45:56 -0000      1.14
+++ Makefile    8 Jan 2011 21:09:47 -0000
@@ -4,9 +4,8 @@
 
 COMMENT =      distributed version control system by Canonical
 
-MODPY_EGG_VERSION = 2.0.3
+MODPY_EGG_VERSION = 2.2.2
 DISTNAME =     bzr-${MODPY_EGG_VERSION}
-REVISION =     1
 CATEGORIES =   devel
 
 HOMEPAGE =     http://bazaar-vcs.org/
@@ -27,7 +26,8 @@
 RUN_DEPENDS += net/py-curl \
                security/py-paramiko \
                textproc/gdiff
-REGRESS_DEPENDS = ${RUN_DEPENDS}
+REGRESS_DEPENDS = ${RUN_DEPENDS} \
+               devel/py-testtools
 
 pre-configure:
        ${SUBST_CMD} ${WRKSRC}/bzr ${WRKSRC}/bzrlib/tests/test_diff.py
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/bzr/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo    9 Jan 2010 00:21:30 -0000       1.6
+++ distinfo    8 Jan 2011 21:09:47 -0000
@@ -1,5 +1,5 @@
-MD5 (bzr-2.0.3.tar.gz) = YHWOYbP9NoaWbXqw6hf6ZA==
-RMD160 (bzr-2.0.3.tar.gz) = OzPlFI/0fmawMV6WTSuOVl0FZnU=
-SHA1 (bzr-2.0.3.tar.gz) = F4/mVG0yoXUqnpq8pX2xKEY7seY=
-SHA256 (bzr-2.0.3.tar.gz) = dXlpuL+XwEkpe9BBt4PBl7s5g7BWKaT7B891wt73eAs=
-SIZE (bzr-2.0.3.tar.gz) = 6616470
+MD5 (bzr-2.2.2.tar.gz) = 0b+i/RqtKCxCPHjWLrrLIQ==
+RMD160 (bzr-2.2.2.tar.gz) = iI4PWciOD94mrfaXqUIu1zLMMyk=
+SHA1 (bzr-2.2.2.tar.gz) = nbjwYdlLo/C0jc1iPEc8botXC2o=
+SHA256 (bzr-2.2.2.tar.gz) = c07gw6ZOe4INZjKuDipL+RrdkI/evlyChlYYw4F1yOM=
+SIZE (bzr-2.2.2.tar.gz) = 6897175
Index: patches/patch-bzr
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzr,v
retrieving revision 1.3
diff -u -r1.3 patch-bzr
--- patches/patch-bzr   19 Sep 2009 22:08:52 -0000      1.3
+++ patches/patch-bzr   8 Jan 2011 21:09:47 -0000
@@ -1,9 +1,9 @@
-$OpenBSD: patch-bzr,v 1.3 2009/09/19 22:08:52 fgsch Exp $
---- bzr.orig   Thu Aug 20 09:41:03 2009
-+++ bzr        Mon Sep 14 23:10:15 2009
+$OpenBSD$
+--- bzr.orig   Mon Dec  6 17:49:57 2010
++++ bzr        Mon Dec  6 17:50:14 2010
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#! ${MODPY_BIN}
  
- # Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
+ # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
  #
Index: patches/patch-bzrlib_diff_py
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_diff_py,v
retrieving revision 1.3
diff -u -r1.3 patch-bzrlib_diff_py
--- patches/patch-bzrlib_diff_py        19 Sep 2009 22:08:52 -0000      1.3
+++ patches/patch-bzrlib_diff_py        8 Jan 2011 21:09:47 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-bzrlib_diff_py,v 1.3 2009/09/19 22:08:52 fgsch Exp $
---- bzrlib/diff.py.orig        Mon Sep 14 23:11:06 2009
-+++ bzrlib/diff.py     Mon Sep 14 23:11:13 2009
-@@ -176,7 +176,7 @@ def external_diff(old_filename, oldlines, new_filename
+$OpenBSD$
+--- bzrlib/diff.py.orig        Mon Dec  6 17:51:40 2010
++++ bzrlib/diff.py     Mon Dec  6 17:51:33 2010
+@@ -189,7 +189,7 @@ def external_diff(old_filename, oldlines, new_filename
              # Since we are dealing with an ANSI api, use mbcs encoding
              old_filename = old_filename.encode('mbcs')
              new_filename = new_filename.encode('mbcs')
Index: patches/patch-bzrlib_patch_py
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_patch_py,v
retrieving revision 1.1
diff -u -r1.1 patch-bzrlib_patch_py
--- patches/patch-bzrlib_patch_py       21 Apr 2008 19:00:56 -0000      1.1
+++ patches/patch-bzrlib_patch_py       8 Jan 2011 21:09:47 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-bzrlib_patch_py,v 1.1 2008/04/21 19:00:56 okan Exp $
---- bzrlib/patch.py.orig       Thu Mar 20 03:12:09 2008
-+++ bzrlib/patch.py    Wed Apr  2 23:11:25 2008
+$OpenBSD$
+--- bzrlib/patch.py.orig       Mon Dec  6 17:52:07 2010
++++ bzrlib/patch.py    Mon Dec  6 17:52:44 2010
 @@ -65,7 +65,7 @@ def patch(patch_contents, filename, output_filename=No
      :type reverse: bool
      :return: 0 on success, 1 if some hunks failed
Index: patches/patch-bzrlib_python-compat_h
===================================================================
RCS file: patches/patch-bzrlib_python-compat_h
diff -N patches/patch-bzrlib_python-compat_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-bzrlib_python-compat_h        8 Jan 2011 21:09:47 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- bzrlib/python-compat.h.orig        Tue Dec  7 11:03:32 2010
++++ bzrlib/python-compat.h     Tue Dec  7 11:03:44 2010
+@@ -67,6 +67,7 @@
+     #endif
+ #else /* Not win32 */
+     /* For htonl */
++    #include <netinet/in.h>
+     #include "arpa/inet.h"
+ #endif
+ 
Index: patches/patch-bzrlib_tests_test_diff_py
===================================================================
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_tests_test_diff_py,v
retrieving revision 1.2
diff -u -r1.2 patch-bzrlib_tests_test_diff_py
--- patches/patch-bzrlib_tests_test_diff_py     19 Sep 2009 22:08:52 -0000      
1.2
+++ patches/patch-bzrlib_tests_test_diff_py     8 Jan 2011 21:09:47 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-bzrlib_tests_test_diff_py,v 1.2 2009/09/19 22:08:52 fgsch Exp $
---- bzrlib/tests/test_diff.py.orig     Thu Aug 20 09:41:09 2009
-+++ bzrlib/tests/test_diff.py  Mon Sep 14 23:10:15 2009
-@@ -261,7 +261,7 @@ class TestDiffFiles(TestCaseInTempDir):
+$OpenBSD$
+--- bzrlib/tests/test_diff.py.orig     Mon Dec  6 17:54:43 2010
++++ bzrlib/tests/test_diff.py  Mon Dec  6 17:54:32 2010
+@@ -246,7 +246,7 @@ class TestDiffFiles(tests.TestCaseInTempDir):
          # Make sure external_diff doesn't fail in the current LANG
          lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
  
@@ -10,12 +10,12 @@
          open('old', 'wb').write('\x00foobar\n')
          open('new', 'wb').write('foo\x00bar\n')
          pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-@@ -1309,7 +1309,7 @@ class TestDiffFromTool(TestCaseWithTransport):
+@@ -1352,7 +1352,7 @@ class TestDiffFromTool(tests.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)
+-        diff_obj = diff.DiffFromTool(['python', '-c',
++        diff_obj = diff.DiffFromTool(['${MODPY_BIN}', '-c',
+                                       'print "@old_path @new_path"'],
+                                      None, None, output)
          self.addCleanup(diff_obj.finish)
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup_py      8 Jan 2011 21:09:47 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- setup.py.orig      Tue Dec  7 10:58:25 2010
++++ setup.py   Tue Dec  7 10:58:53 2010
+@@ -731,7 +731,7 @@ else:
+         # easy_install one
+         DATA_FILES = [('man/man1', ['bzr.1'])]
+ 
+-    if sys.platform != 'win32':
++    if False:
+         # see https://wiki.kubuntu.org/Apport/DeveloperHowTo
+         #
+         # checking the paths and hardcoding the check for root is a bit gross,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/bzr/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST   9 Jan 2010 00:21:30 -0000       1.5
+++ pkg/PLIST   8 Jan 2011 21:09:50 -0000
@@ -38,6 +38,10 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/_rio_py.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/_rio_py.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/_rio_pyx.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_simple_set_pyx.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_static_tuple_c.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_static_tuple_py.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_static_tuple_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
@@ -46,62 +50,6 @@
 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/
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/__init__.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_add.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_add.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_bench.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_bench.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_bundle.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_bundle.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_cache_utf8.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_cache_utf8.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_checkout.py
-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
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_sftp.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_startup.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_startup.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_status.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_status.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_tags.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_tags.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_transform.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_transform.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_workingtree.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_workingtree.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_xml.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/bench_xml.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/__init__.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/heavily_merged.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/heavily_merged.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/kernel_like.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/kernel_like.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/benchmarks/tree_creator/many_commit.py
-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/bencode.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bencode.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/bisect_multi.py
@@ -150,8 +98,12 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/chunk_writer.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/clean_tree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/clean_tree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/cleanup.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/cleanup.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/cmd_version_info.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/cmd_version_info.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/cmdline.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/cmdline.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/commands.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/commands.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/commit.py
@@ -243,11 +195,12 @@
 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/conflict-types.txt
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/content-filters.txt
 lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/debug-flags.txt
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/diverged-branches.txt
 lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/eol.txt
+lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/location-alias.txt
 lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/log-formats.txt
 lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/patterns.txt
 lib/python${MODPY_VERSION}/site-packages/bzrlib/help_topics/en/rules.txt
@@ -279,6 +232,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lazy_import.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lazy_regex.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lazy_regex.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/library_state.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/library_state.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/lockable_files.py
@@ -326,17 +281,33 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/bashcomp.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/bashcomp.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/tests/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/tests/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/tests/test_bashcomp.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/bash_completion/tests/test_bashcomp.pyc
 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_api.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_api.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_propose.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/lp_propose.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_api.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/launchpad/test_lp_api.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_login.py
@@ -355,6 +326,18 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/netrc_credential_store/tests/__init__.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/netrc_credential_store/tests/test_netrc.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/netrc_credential_store/tests/test_netrc.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/news_merge.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/news_merge.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/parser.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/parser.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/tests/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/tests/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/tests/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/tests/test_news_merge.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/plugins/news_merge/tests/test_news_merge.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/push.py
@@ -363,6 +346,8 @@
 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/recordcounter.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/recordcounter.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
@@ -431,6 +416,8 @@
 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/static_tuple.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/static_tuple.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/
@@ -501,6 +488,8 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_conflicts.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_debug.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_debug.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_deleted.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_deleted.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_diff.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_diff.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_dpush.py
@@ -539,6 +528,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_log.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_logformats.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_logformats.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_lookup_revision.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_lookup_revision.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
@@ -587,6 +578,8 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_revision_info.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_revno.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_revno.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_rmbranch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/blackbox/test_rmbranch.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
@@ -652,6 +645,8 @@
 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_revert.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/commands/test_revert.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/fake_command.py
@@ -660,6 +655,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/features.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/file_utils.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/file_utils.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/fixtures.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/fixtures.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ftp_server/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ftp_server/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ftp_server/__init__.pyc
@@ -675,6 +672,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/https_server.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/matchers.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/matchers.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_branch/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_branch/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_branch/__init__.pyc
@@ -688,6 +687,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_branch/test_check.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_branch/test_commit.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_branch/test_commit.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_branch/test_config.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_branch/test_config.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_branch/test_create_checkout.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_branch/test_create_checkout.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_branch/test_create_clone.py
@@ -739,9 +740,27 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir/test_bzrdir.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir/test_push.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir/test_push.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/test_supported.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/test_supported.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/test_unsupported.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_bzrdir_colo/test_unsupported.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_foreign_vcs/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_foreign_vcs/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_foreign_vcs/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_foreign_vcs/test_branch.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_foreign_vcs/test_branch.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_foreign_vcs/test_repository.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_foreign_vcs/test_repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/__init__.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_copy_content_into.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_copy_content_into.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_get.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_get.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_pull.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_pull.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_interbranch/test_push.py
@@ -772,6 +791,8 @@
 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/per_merger.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_merger.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_pack_repository.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_pack_repository.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_repository/
@@ -880,6 +901,8 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_iter_search_rules.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_list_files.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_list_files.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_locking.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_locking.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_path_content_summary.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_path_content_summary.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_revision_tree.py
@@ -890,6 +913,9 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_walkdirs.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_tree/test_walkdirs.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_uifactory/
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_uifactory/__init__.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_uifactory/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_versionedfile.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_versionedfile.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/
@@ -963,6 +989,8 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_set_root_id.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_smart_add.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_smart_add.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_symlinks.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_symlinks.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_uncommit.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_uncommit.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_unversion.py
@@ -973,9 +1001,12 @@
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_walkdirs.pyc
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_workingtree.py
 
lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/per_workingtree/test_workingtree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/script.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/script.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ssl_certs/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ssl_certs/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ssl_certs/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ssl_certs/ca.crt
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ssl_certs/create_ssls.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ssl_certs/create_ssls.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/ssl_certs/server.crt
@@ -985,6 +1016,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/stub_sftp.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__annotator.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__annotator.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__bencode.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__bencode.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__chk_map.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__chk_map.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__chunks_to_lines.py
@@ -997,6 +1030,10 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__known_graph.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__rio.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__rio.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__simple_set.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__simple_set.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__static_tuple.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__static_tuple.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__walkdirs_win32.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test__walkdirs_win32.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ancestry.py
@@ -1009,8 +1046,6 @@
 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_bencode.py
-lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_bencode.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
@@ -1035,6 +1070,10 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_chunk_writer.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_clean_tree.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_clean_tree.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_cleanup.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_cleanup.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_cmdline.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_cmdline.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_commands.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_commands.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_commit.py
@@ -1079,6 +1118,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_fifo_cache.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_filters.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_filters.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_fixtures.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_fixtures.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_foreign.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_foreign.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_ftp_transport.py
@@ -1111,6 +1152,8 @@
 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_import_tariff.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_import_tariff.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
@@ -1125,6 +1168,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lazy_import.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lazy_regex.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lazy_regex.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_library_state.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_library_state.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lock.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lock.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_lockable_files.py
@@ -1139,6 +1184,8 @@
 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_matchers.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_matchers.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
@@ -1231,10 +1278,14 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_rules.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_sampler.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_sampler.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_script.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_script.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_selftest.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_selftest.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_serializer.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_serializer.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_server.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_server.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_setup.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_setup.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_sftp_transport.py
@@ -1293,6 +1344,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_tree.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_treebuilder.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_treebuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_treeshape.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_treeshape.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_tsort.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_tsort.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/tests/test_tuned_gzip.py
@@ -1335,8 +1388,6 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textinv.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/textmerge.py
 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
@@ -1363,6 +1414,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/ftp/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/ftp/_gssapi.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/ftp/_gssapi.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/gio_transport.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/gio_transport.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/http/__init__.pyc
@@ -1386,6 +1439,8 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/memory.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/nosmart.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/nosmart.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/pathfilter.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/transport/pathfilter.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
@@ -1468,8 +1523,6 @@
 lib/python${MODPY_VERSION}/site-packages/bzrlib/views.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/weave.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/weave.pyc
-lib/python${MODPY_VERSION}/site-packages/bzrlib/weave_commands.py
-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/win32utils.py

Reply via email to