Update to 0.6

PR:		ports/88145
Submitted by:	maintainer

6 files changed, 172 insertions, 20 deletions

diff --git a/devel/bazaar-ng/Makefile b/devel/bazaar-ng/Makefile
index 2d4fa57e4546..8540ffca12f2 100644
--- a/devel/bazaar-ng/Makefile
+++ b/devel/bazaar-ng/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.1.1
+PORTVERSION=	0.6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.bazaar-ng.org/pkg/
 MASTER_SITE_SUBDIR=	gnu-arch
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	lulf@kerneled.org
-COMMENT=	An implementation of the GNU arch RCS protocol by Canonical
+COMMENT=	A Python implementation of the GNU arch RCS protocol by Canonical
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/elementtree/ElementTree.py:${PORTSDIR}/devel/py-elementtree
 
diff --git a/devel/bazaar-ng/distinfo b/devel/bazaar-ng/distinfo
index ed845be9fabc..0dfb98381b4c 100644
--- a/devel/bazaar-ng/distinfo
+++ b/devel/bazaar-ng/distinfo
@@ -1,2 +1,2 @@
-MD5 (bzr-0.1.1.tar.gz) = 583f1bf1129823db45e6b63f26bb0c52
-SIZE (bzr-0.1.1.tar.gz) = 416362
+MD5 (bzr-0.6.tar.gz) = 3ba20e4bd0fa902ae293d458490c756f
+SIZE (bzr-0.6.tar.gz) = 519526
diff --git a/devel/bazaar-ng/pkg-plist b/devel/bazaar-ng/pkg-plist
index cb028da0e970..b81ffd7294de 100644
--- a/devel/bazaar-ng/pkg-plist
+++ b/devel/bazaar-ng/pkg-plist
@@ -32,6 +32,12 @@ bin/bzr
 %%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
@@ -47,6 +53,9 @@ bin/bzr
 %%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
@@ -92,6 +101,9 @@ bin/bzr
 %%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
@@ -104,9 +116,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/conflicts.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/conflicts.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/conflicts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyo
@@ -131,15 +140,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/selftest/blackbox.py
 %%PYTHON_SITELIBDIR%%/bzrlib/selftest/blackbox.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/selftest/blackbox.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/plugins.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/plugins.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/plugins.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
@@ -170,21 +182,36 @@ bin/bzr
 %%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
@@ -200,27 +227,51 @@ bin/bzr
 %%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
@@ -251,6 +302,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/store/weave.py
 %%PYTHON_SITELIBDIR%%/bzrlib/store/weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/store/weave.pyo
+%%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
@@ -272,9 +326,18 @@ bin/bzr
 %%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/sftp.pyc
+%%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
@@ -284,6 +347,15 @@ bin/bzr
 %%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/effbot/org/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/__init__.pyo
@@ -308,6 +380,9 @@ bin/bzr
 %%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
@@ -324,6 +399,7 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/selftest
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/store
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 2d4fa57e4546..8540ffca12f2 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	0.1.1
+PORTVERSION=	0.6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.bazaar-ng.org/pkg/
 MASTER_SITE_SUBDIR=	gnu-arch
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	lulf@kerneled.org
-COMMENT=	An implementation of the GNU arch RCS protocol by Canonical
+COMMENT=	A Python implementation of the GNU arch RCS protocol by Canonical
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/elementtree/ElementTree.py:${PORTSDIR}/devel/py-elementtree
 
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index ed845be9fabc..0dfb98381b4c 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,2 +1,2 @@
-MD5 (bzr-0.1.1.tar.gz) = 583f1bf1129823db45e6b63f26bb0c52
-SIZE (bzr-0.1.1.tar.gz) = 416362
+MD5 (bzr-0.6.tar.gz) = 3ba20e4bd0fa902ae293d458490c756f
+SIZE (bzr-0.6.tar.gz) = 519526
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index cb028da0e970..b81ffd7294de 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -32,6 +32,12 @@ bin/bzr
 %%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
@@ -47,6 +53,9 @@ bin/bzr
 %%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
@@ -92,6 +101,9 @@ bin/bzr
 %%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
@@ -104,9 +116,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/conflicts.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/conflicts.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/conflicts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/progress.pyo
@@ -131,15 +140,18 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/selftest/blackbox.py
 %%PYTHON_SITELIBDIR%%/bzrlib/selftest/blackbox.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/selftest/blackbox.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/plugins.py
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/plugins.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/selftest/plugins.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
@@ -170,21 +182,36 @@ bin/bzr
 %%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
@@ -200,27 +227,51 @@ bin/bzr
 %%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
@@ -251,6 +302,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/store/weave.py
 %%PYTHON_SITELIBDIR%%/bzrlib/store/weave.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/store/weave.pyo
+%%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
@@ -272,9 +326,18 @@ bin/bzr
 %%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/sftp.pyc
+%%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
@@ -284,6 +347,15 @@ bin/bzr
 %%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/effbot/org/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org/__init__.pyo
@@ -308,6 +380,9 @@ bin/bzr
 %%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
@@ -324,6 +399,7 @@ bin/bzr
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/selftest
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/store
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/transport
+@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/configobj
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot/org
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/effbot
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/util/elementtree