- Update to 0.7

PR:		ports/92219
Submitted by:	Ulf Lilleengen <lulf@stud.ntnu.no> (maintainer)

3 files changed, 428 insertions, 335 deletions

diff --git a/devel/bazaar-ng/Makefile b/devel/bazaar-ng/Makefile
index 23182d7cf3a2..4bd85abdbffd 100644
--- a/devel/bazaar-ng/Makefile
+++ b/devel/bazaar-ng/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.6.2
+PORTVERSION=	0.7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.bazaar-ng.org/pkg/
 MASTER_SITE_SUBDIR=	gnu-arch
@@ -23,7 +23,7 @@ USE_PYDISTUTILS=	yes
 MAN1=		bzr.1
 
 post-build:
-	cd ${WRKSRC} && ${PYTHON_CMD} bzr-man.py
+	cd ${WRKSRC} && ${PYTHON_CMD} bzr_man.py
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/bzr.1 ${MAN1PREFIX}/man/man1
diff --git a/devel/bazaar-ng/distinfo b/devel/bazaar-ng/distinfo
index f2fe09bc3ca3..e65cb59c3cef 100644
--- a/devel/bazaar-ng/distinfo
+++ b/devel/bazaar-ng/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-0.6.2.tar.gz) = df3216cc53e86756d203869b94fee6b8
-SHA256 (bzr-0.6.2.tar.gz) = 6666b73c3223e423dcd91ba51b44da750e26dbd006d45e7135513ecbff488bf4
-SIZE (bzr-0.6.2.tar.gz) = 519926
+MD5 (bzr-0.7.tar.gz) = 5daf99b67478027ed0914edf32997181
+SHA256 (bzr-0.7.tar.gz) = a9abf88785f0d2c397de9cf4ef02cb63462b1458f583d3ce48cd6f7c21e7a36b
+SIZE (bzr-0.7.tar.gz) = 569679
diff --git a/devel/bazaar-ng/pkg-plist b/devel/bazaar-ng/pkg-plist
index b81ffd7294de..fd0e3236f499 100644
--- a/devel/bazaar-ng/pkg-plist
+++ b/devel/bazaar-ng/pkg-plist
@@ -1,407 +1,500 @@
 bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/add.py
-%%PYTHON_SITELIBDIR%%/bzrlib/add.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/annotate.py
-%%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.py
-%%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/branch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/branch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/builtins.py
-%%PYTHON_SITELIBDIR%%/bzrlib/builtins.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/builtins.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/changeset.py
-%%PYTHON_SITELIBDIR%%/bzrlib/changeset.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/changeset.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/check.py
-%%PYTHON_SITELIBDIR%%/bzrlib/check.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/check.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/clone.py
-%%PYTHON_SITELIBDIR%%/bzrlib/clone.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/clone.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/commands.py
-%%PYTHON_SITELIBDIR%%/bzrlib/commands.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/commands.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/commit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/commit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/config.py
-%%PYTHON_SITELIBDIR%%/bzrlib/config.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/config.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/conflicts.py
-%%PYTHON_SITELIBDIR%%/bzrlib/conflicts.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/conflicts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/delta.py
-%%PYTHON_SITELIBDIR%%/bzrlib/delta.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/delta.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/diff.py
-%%PYTHON_SITELIBDIR%%/bzrlib/diff.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/diff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/errors.py
-%%PYTHON_SITELIBDIR%%/bzrlib/errors.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.py
-%%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/fetch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/gpg.py
-%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/graph.py
-%%PYTHON_SITELIBDIR%%/bzrlib/graph.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/hashcache.py
-%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/help.py
-%%PYTHON_SITELIBDIR%%/bzrlib/help.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/help.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/identitymap.py
-%%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/info.py
-%%PYTHON_SITELIBDIR%%/bzrlib/info.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/info.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/intset.py
-%%PYTHON_SITELIBDIR%%/bzrlib/intset.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/intset.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/inventory.py
-%%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/lock.py
-%%PYTHON_SITELIBDIR%%/bzrlib/lock.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/lock.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/log.py
-%%PYTHON_SITELIBDIR%%/bzrlib/log.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/log.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/mdiff.py
-%%PYTHON_SITELIBDIR%%/bzrlib/mdiff.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/mdiff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/lsprof.py
 %%PYTHON_SITELIBDIR%%/bzrlib/merge.py
-%%PYTHON_SITELIBDIR%%/bzrlib/merge.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/merge.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/merge3.py
-%%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/merge_core.py
-%%PYTHON_SITELIBDIR%%/bzrlib/merge_core.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/merge_core.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/missing.py
-%%PYTHON_SITELIBDIR%%/bzrlib/missing.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/missing.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.py
-%%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/option.py
-%%PYTHON_SITELIBDIR%%/bzrlib/option.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/option.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/osutils.py
-%%PYTHON_SITELIBDIR%%/bzrlib/osutils.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/osutils.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/patch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/patch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/patch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugin.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugin.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugin.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.py
-%%PYTHON_SITELIBDIR%%/bzrlib/progress.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/progress.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/revfile.py
-%%PYTHON_SITELIBDIR%%/bzrlib/revfile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/revfile.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revision.py
-%%PYTHON_SITELIBDIR%%/bzrlib/revision.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/revision.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.py
-%%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/HTTPTestUtil.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/HTTPTestUtil.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/HTTPTestUtil.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/TestUtil.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/TestUtil.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/TestUtil.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/blackbox.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/blackbox.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/blackbox.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/stub_sftp.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/stub_sftp.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/stub_sftp.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_ancestry.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_ancestry.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_ancestry.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_bad_files.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_bad_files.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_bad_files.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_command.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_command.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_command.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_commit.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_commit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_commit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_commit_merge.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_commit_merge.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_commit_merge.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_conflicts.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_conflicts.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_conflicts.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_merge_core.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_merge_core.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_merge_core.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_parent.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_parent.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_parent.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_revision_info.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_revision_info.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_revision_info.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_smart_add.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_smart_add.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_smart_add.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_upgrade.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_upgrade.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_upgrade.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_weave.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_weave.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_weave.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_xml.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_xml.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/test_xml.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testannotate.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testannotate.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testannotate.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testapi.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testapi.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testapi.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testbranch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testbranch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testbranch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testconfig.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testconfig.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testconfig.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testdiff.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testdiff.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testdiff.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testfetch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testfetch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testfetch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testgpg.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testgpg.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testgpg.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testgraph.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testgraph.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testgraph.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testhashcache.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testhashcache.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testhashcache.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testhttp.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testhttp.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testhttp.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testidentitymap.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testidentitymap.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testidentitymap.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testinv.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testinv.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testinv.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testlog.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testlog.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testlog.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testmerge.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testmerge.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testmerge.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testmerge3.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testmerge3.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testmerge3.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testnonascii.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testnonascii.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testnonascii.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testoptions.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testoptions.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testoptions.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testplugins.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testplugins.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testplugins.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testrevision.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testrevision.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testrevision.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testrevisionnamespaces.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testrevisionnamespaces.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testrevisionnamespaces.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testrevprops.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testrevprops.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testrevprops.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testreweave.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testreweave.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testreweave.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testsampler.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testsampler.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testsampler.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testsftp.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testsftp.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testsftp.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/teststatus.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/teststatus.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/teststatus.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/teststore.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/teststore.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/teststore.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testtestament.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testtestament.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testtestament.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testtransactions.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testtransactions.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testtransactions.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testtransport.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testtransport.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testtransport.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testtsort.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testtsort.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testtsort.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testworkingtree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testworkingtree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/testworkingtree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/treeshape.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/treeshape.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/treeshape.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/versioning.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/versioning.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/versioning.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/whitebox.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/whitebox.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/whitebox.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/rio.py
 %%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.py
-%%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/status.py
-%%PYTHON_SITELIBDIR%%/bzrlib/status.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/status.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/store/compressed_text.py
-%%PYTHON_SITELIBDIR%%/bzrlib/store/compressed_text.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/store/compressed_text.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/store/text.py
-%%PYTHON_SITELIBDIR%%/bzrlib/store/text.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/store/text.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/store/weave.py
-%%PYTHON_SITELIBDIR%%/bzrlib/store/weave.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/store/weave.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.py
 %%PYTHON_SITELIBDIR%%/bzrlib/testament.py
-%%PYTHON_SITELIBDIR%%/bzrlib/testament.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/testament.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textinv.py
-%%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/textui.py
-%%PYTHON_SITELIBDIR%%/bzrlib/textui.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/textui.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/trace.py
-%%PYTHON_SITELIBDIR%%/bzrlib/trace.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/trace.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transactions.py
-%%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tsort.py
+%%PYTHON_SITELIBDIR%%/bzrlib/uncommit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/upgrade.py
+%%PYTHON_SITELIBDIR%%/bzrlib/weave.py
+%%PYTHON_SITELIBDIR%%/bzrlib/weavefile.py
+%%PYTHON_SITELIBDIR%%/bzrlib/win32console.py
+%%PYTHON_SITELIBDIR%%/bzrlib/workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/xml.py
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.py
+%%PYTHON_SITELIBDIR%%/bzrlib/xml5.py
+%%PYTHON_SITELIBDIR%%/bzrlib/export/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/export/dir_exporter.py
+%%PYTHON_SITELIBDIR%%/bzrlib/export/tar_exporter.py
+%%PYTHON_SITELIBDIR%%/bzrlib/export/zip_exporter.py
+%%PYTHON_SITELIBDIR%%/bzrlib/export/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/export/dir_exporter.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/export/tar_exporter.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/export/zip_exporter.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/export/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/export/dir_exporter.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/export/tar_exporter.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/export/zip_exporter.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/store/text.py
+%%PYTHON_SITELIBDIR%%/bzrlib/store/weave.py
+%%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/store/text.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/store/weave.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/store/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/store/text.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/store/weave.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_annotate.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_basis_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit_merge.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_parent.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_remove.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revprops.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reweave.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_trace.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transactions.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_uncommit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_added.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_too_much.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_added.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_too_much.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_added.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_cat.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_export.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_log.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_missing.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_pull.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revision_info.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_revno.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_status.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_too_much.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_versioning.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_annotate.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_basis_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit_merge.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_parent.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_remove.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revprops.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reweave.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_trace.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transactions.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_uncommit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/HTTPTestUtil.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/TestUtil.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/stub_sftp.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ancestry.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_annotate.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_api.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_bad_files.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_basis_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_branch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_command.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_commit_merge.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_config.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_conflicts.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_fetch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_gpg.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_inv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_log.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_graph.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_hashcache.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_identitymap.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge3.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_merge_core.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_missing.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_msgeditor.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_nonascii.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_options.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_osutils.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_parent.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_permissions.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_plugins.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_remove.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revision.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revisionnamespaces.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_rio.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_ui.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_revprops.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_reweave.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sampler.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_selftest.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_setup.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_sftp_transport.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_smart_add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_source.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_status.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_store.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_symbol_versioning.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_testament.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_trace.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transactions.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_transport.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_tsort.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_uncommit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_upgrade.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_weave.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_whitebox.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_workingtree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_xml.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/treeshape.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/ftp.py
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/http.py
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/http.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/http.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/local.py
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/local.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/local.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.py
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.py
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/ftp.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/local.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/ftp.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/http.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/local.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transport/memory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/transport/sftp.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tsort.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/ui.py
-%%PYTHON_SITELIBDIR%%/bzrlib/ui.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/ui.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/upgrade.py
-%%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.py
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/ui/text.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/validate.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/validate.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/validate.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/ElementTree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/ElementTree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/ElementTree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/gzip_consumer.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/gzip_consumer.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/gzip_consumer.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/http_client.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/http_client.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/http_client.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/http_manager.py
+%%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/gzip_consumer.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/http_client.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/http_manager.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/gzip_consumer.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/http_client.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/http_manager.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/ElementTree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/ElementTree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/ElementTree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/weave.py
+%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.py
+%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/validate.py
+%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/validate.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/configobj.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/util/configobj/validate.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/add.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/builtins.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/changeset.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/check.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/clone.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/commands.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/config.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/conflicts.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/delta.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/diff.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/errors.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/graph.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/help.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/info.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/intset.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/lock.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/log.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/lsprof.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/merge.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/merge_core.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/missing.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/option.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/osutils.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/patch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugin.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/progress.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/revision.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/rio.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/status.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/testament.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/textui.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/trace.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/uncommit.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/weave.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/weave.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/weavefile.py
 %%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/win32console.py
 %%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/workingtree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/xml.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/xml.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/xml5.py
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/annotate.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/atomicfile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/branch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/builtins.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/changeset.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/check.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/clone.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/commands.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/commit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/config.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/conflicts.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/delta.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/errors.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/externalcommand.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/fetch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/gpg.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/graph.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/hashcache.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/help.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/identitymap.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/info.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/intset.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/lock.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/log.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/lsprof.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/merge.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/merge3.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/merge_core.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/missing.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/msgeditor.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/option.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/osutils.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/patch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugin.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/progress.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/revision.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/revisionspec.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/rio.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/shellcomplete.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/status.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/symbol_versioning.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/testament.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/textinv.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/textui.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/trace.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/transactions.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tsort.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/uncommit.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/upgrade.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/weave.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/weavefile.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/win32console.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/workingtree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/xml.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/xml4.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/xml5.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/export
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/selftest
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/store
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/tests
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/ui
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib