Update to 0.7:

bzr 0.7 2006-01-23

  CHANGES:

    * .bzrignore is excluded from exports, on the grounds that it's a bzr
      internal-use file and may not be wanted.  (Jamie Wilkinson)

    * The "bzr directories" command were removed in favor of the new
      --kind option to the "bzr inventory" command.  To list all
      versioned directories, now use "bzr inventory --kind directory".
      (Johan Rydberg)

    * Under Windows configuration directory is now %APPDATA%\bazaar\2.0
      by default. (John Arbash Meinel)

    * The parent of Bzr configuration directory can be set by BZR_HOME
      environment variable. Now the path for it is searched in BZR_HOME, then
      in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
      points to C:\Documents and Settings\User Name\Application Data), HOME.
      (John Arbash Meinel)

    * Plugins with the same name in different directories in the bzr plugin
      path are no longer loaded: only the first successfully loaded one is
      used. (Robert Collins)

    * Use systems' external ssh command to open connections if possible.
      This gives better integration with user settings such as ProxyCommand.
      (James Henstridge)

    * Sftp paths can now be relative, or local, according to the IETF
      draft spec.  Paths now take the form:
      sftp://user:pass@host:port/relative/path
      or
      sftp://user:pass@host:port/%2Fabsolute/path
      or
      sftp://user:pass@host:port//absolute/path

    * Permissions on files underneath .bzr/ are inherited from the .bzr
      directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
      will mean that future file will be created with group write permissions.

    * configure.in and config.guess are no longer in the builtin default
      ignore list.

    * '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
      files.  (John Arbash Meinel, Martin Pool)

  IMPROVEMENTS:

    * "bzr INIT dir" now initializes the specified directory, and creates
      it if it does not exist.  (John Arbash Meinel)

    * New remerge command (Aaron Bentley)

    * Better zsh completion script.  (Steve Borho)

    * 'bzr diff' now returns 1 when there are changes in the working
      tree. (Robert Collins)

    * 'bzr push' now exists and can push changes to a remote location.
      This uses the transport infrastructure, and can store the remote
      location in the ~/.bazaar/branches.conf configuration file.
      (Robert Collins)

    * Test directories are only kept if the test fails and the user requests
      that they be kept.

    * Tweaks to short log printing

    * Added branch nicks, new nick command, printing them in log output.
      (Aaron Bentley)

    * If $BZR_PDB is set, pop into the debugger when an uncaught exception
      occurs.  (Martin Pool)

    * Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
      the same as Subversion.  (Martin Pool)

    * New ftp transport support (on ftplib), for ftp:// and aftp://
      URLs.  (Daniel Silverstone)

    * Commit editor temporary files now start with 'bzr_log.', to allow
      text editors to match the file name and set up appropriate modes or
      settings.  (Magnus Therning)

    * Improved performance when integrating changes from a remote weave.
      (Goffredo Baroncelli)

    * Sftp will attempt to cache the connection, so it is more likely that
      a connection will be reused, rather than requiring multiple password
      requests.

    * bzr revno now takes an optional argument indicating the branch whose
      revno should be printed.  (Michael Ellerman)

    * bzr cat defaults to printing the last version of the file.
      (#3632, Matthieu Moy)

    * New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
      profiler.  (Denys Duchier)

    * Faster commits by reading only the headers of affected weave files.
      (Denys Duchier)

    * 'bzr add' now takes a --dry-run parameter which shows you what would be
      added, but doesn't actually add anything. (Michael Ellerman)

    * bzr add now lists how many files were ignored per glob.  add --verbose
      lists the specific files.  (Aaron Bentley)

    * Reduced CPU usage for merge/fetch. (Goffredo Baroncelli)

    * Faster diff and status commands.  (Denys Duchier)

  BUG FIXES:

    * SFTP can walk up to the root path without index errors. (Robert Collins)

    * Fix bugs in running bzr with 'python -O'.  (Martin Pool)

    * Error when run with -OO

    * Fix bug in reporting http errors that don't have an http error code.
      (Martin Pool)

    * Handle more cases of pipe errors in display commands

    * Change status to 3 for all errors

    * Files that are added and unlinked before committing are completely
      ignored by diff and status

    * Stores with some compressed texts and some uncompressed texts are now
      able to be used. (John A Meinel)

    * Fix for bzr pull failing sometimes under windows

    * Fix for sftp transport under windows when using interactive auth

    * Show files which are both renamed and modified as such in 'bzr
      status' output.  (#4503, Daniel Silverstone)

    * Make annotate cope better with revisions committed without a valid
      email address.  (Marien Zwart)

    * Fix representation of tab characters in commit messages.  (Harald
      Meland)

    * List of plugin directories in BZR_PLUGIN_PATH environment variable is
      now parsed properly under Windows. (Alexander Belchenko)

    * Show number of revisions pushed/pulled/merged. (Robey Pointer)

    * Keep a cached copy of the basis inventory to speed up operations
      that need to refer to it.  (Johan Rydberg, Martin Pool)

    * Fix bugs in bzr status display of non-ascii characters.  (Martin
      Pool)

    * Remove Makefile.in from default ignore list.  (#6413, Tollef Fog
      Heen, Martin Pool)

    * Fix failure in 'bzr added'.  (Nathan McCallum, Martin Pool)

  TESTING:

    * Fix selftest asking for passwords when there are no SFTP keys.
      (Robey Pointer, Jelmer Vernooij)

    * Fix selftest run with 'python -O'.  (Martin Pool)

    * Fix HTTP tests under Windows. (John Arbash Meinel)

    * Make tests work even if HOME is not set (Aaron Bentley)

    * Updated build_tree to use fixed line-endings for tests which read
      the file cotents and compare. Make some tests use this to pass under
      Windows. (John Arbash Meinel)

    * Skip stat and symlink tests under Windows. (Alexander Belchenko)

    * Delay in selftest/testhashcash is now issued under win32 and Cygwin.
      (John Arbash Meinel)

    * Use terminal width to align verbose test output.  (Martin Pool)

    * Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
      If adding a new test script please add that to
      bzrlib.tests.blackbox.__init__. (Robert Collins)

    * Much better error message if one of the test suites can't be
      imported.  (Martin Pool)

    * Make check now runs the test suite twice - once with the default locale,
      and once with all locales forced to C, to expose bugs. This is not
      trivially done within python, so for now its only triggered by running
      Make check. Integrators and packagers who wish to check for full
      platform support should run 'make check' to test the source.
      (Robert Collins)

    * Tests can now run TestSkipped if they can't execute for any reason.
      (Martin Pool) (NB: TestSkipped should only be raised for correctable
      reasons - see the wiki spec ImprovingBzrTestSuite).

  INTERNALS:

   (removed from pkgsrc commit message)

3 files changed, 270 insertions, 176 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index ab168e3dfb5..7f0b8e34f5b 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/01/15 00:22:12 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/25 20:17:57 wiz Exp $
 #
 
-DISTNAME=		bzr-0.6.2
+DISTNAME=		bzr-0.7
 CATEGORIES=		devel
 MASTER_SITES=		http://www.bazaar-ng.org/pkg/
 
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index 1297b3b01ed..6a260c2e348 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/15 00:22:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/01/25 20:17:57 wiz Exp $
 bin/bzr
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
@@ -48,6 +48,18 @@ ${PYSITELIB}/bzrlib/diff.pyo
 ${PYSITELIB}/bzrlib/errors.py
 ${PYSITELIB}/bzrlib/errors.pyc
 ${PYSITELIB}/bzrlib/errors.pyo
+${PYSITELIB}/bzrlib/export/__init__.py
+${PYSITELIB}/bzrlib/export/__init__.pyc
+${PYSITELIB}/bzrlib/export/__init__.pyo
+${PYSITELIB}/bzrlib/export/dir_exporter.py
+${PYSITELIB}/bzrlib/export/dir_exporter.pyc
+${PYSITELIB}/bzrlib/export/dir_exporter.pyo
+${PYSITELIB}/bzrlib/export/tar_exporter.py
+${PYSITELIB}/bzrlib/export/tar_exporter.pyc
+${PYSITELIB}/bzrlib/export/tar_exporter.pyo
+${PYSITELIB}/bzrlib/export/zip_exporter.py
+${PYSITELIB}/bzrlib/export/zip_exporter.pyc
+${PYSITELIB}/bzrlib/export/zip_exporter.pyo
 ${PYSITELIB}/bzrlib/externalcommand.py
 ${PYSITELIB}/bzrlib/externalcommand.pyc
 ${PYSITELIB}/bzrlib/externalcommand.pyo
@@ -84,9 +96,9 @@ ${PYSITELIB}/bzrlib/lock.pyo
 ${PYSITELIB}/bzrlib/log.py
 ${PYSITELIB}/bzrlib/log.pyc
 ${PYSITELIB}/bzrlib/log.pyo
-${PYSITELIB}/bzrlib/mdiff.py
-${PYSITELIB}/bzrlib/mdiff.pyc
-${PYSITELIB}/bzrlib/mdiff.pyo
+${PYSITELIB}/bzrlib/lsprof.py
+${PYSITELIB}/bzrlib/lsprof.pyc
+${PYSITELIB}/bzrlib/lsprof.pyo
 ${PYSITELIB}/bzrlib/merge.py
 ${PYSITELIB}/bzrlib/merge.pyc
 ${PYSITELIB}/bzrlib/merge.pyo
@@ -120,171 +132,15 @@ ${PYSITELIB}/bzrlib/plugins/__init__.pyo
 ${PYSITELIB}/bzrlib/progress.py
 ${PYSITELIB}/bzrlib/progress.pyc
 ${PYSITELIB}/bzrlib/progress.pyo
-${PYSITELIB}/bzrlib/revfile.py
-${PYSITELIB}/bzrlib/revfile.pyc
-${PYSITELIB}/bzrlib/revfile.pyo
 ${PYSITELIB}/bzrlib/revision.py
 ${PYSITELIB}/bzrlib/revision.pyc
 ${PYSITELIB}/bzrlib/revision.pyo
 ${PYSITELIB}/bzrlib/revisionspec.py
 ${PYSITELIB}/bzrlib/revisionspec.pyc
 ${PYSITELIB}/bzrlib/revisionspec.pyo
-${PYSITELIB}/bzrlib/selftest/HTTPTestUtil.py
-${PYSITELIB}/bzrlib/selftest/HTTPTestUtil.pyc
-${PYSITELIB}/bzrlib/selftest/HTTPTestUtil.pyo
-${PYSITELIB}/bzrlib/selftest/TestUtil.py
-${PYSITELIB}/bzrlib/selftest/TestUtil.pyc
-${PYSITELIB}/bzrlib/selftest/TestUtil.pyo
-${PYSITELIB}/bzrlib/selftest/__init__.py
-${PYSITELIB}/bzrlib/selftest/__init__.pyc
-${PYSITELIB}/bzrlib/selftest/__init__.pyo
-${PYSITELIB}/bzrlib/selftest/blackbox.py
-${PYSITELIB}/bzrlib/selftest/blackbox.pyc
-${PYSITELIB}/bzrlib/selftest/blackbox.pyo
-${PYSITELIB}/bzrlib/selftest/stub_sftp.py
-${PYSITELIB}/bzrlib/selftest/stub_sftp.pyc
-${PYSITELIB}/bzrlib/selftest/stub_sftp.pyo
-${PYSITELIB}/bzrlib/selftest/test_ancestry.py
-${PYSITELIB}/bzrlib/selftest/test_ancestry.pyc
-${PYSITELIB}/bzrlib/selftest/test_ancestry.pyo
-${PYSITELIB}/bzrlib/selftest/test_bad_files.py
-${PYSITELIB}/bzrlib/selftest/test_bad_files.pyc
-${PYSITELIB}/bzrlib/selftest/test_bad_files.pyo
-${PYSITELIB}/bzrlib/selftest/test_command.py
-${PYSITELIB}/bzrlib/selftest/test_command.pyc
-${PYSITELIB}/bzrlib/selftest/test_command.pyo
-${PYSITELIB}/bzrlib/selftest/test_commit.py
-${PYSITELIB}/bzrlib/selftest/test_commit.pyc
-${PYSITELIB}/bzrlib/selftest/test_commit.pyo
-${PYSITELIB}/bzrlib/selftest/test_commit_merge.py
-${PYSITELIB}/bzrlib/selftest/test_commit_merge.pyc
-${PYSITELIB}/bzrlib/selftest/test_commit_merge.pyo
-${PYSITELIB}/bzrlib/selftest/test_conflicts.py
-${PYSITELIB}/bzrlib/selftest/test_conflicts.pyc
-${PYSITELIB}/bzrlib/selftest/test_conflicts.pyo
-${PYSITELIB}/bzrlib/selftest/test_merge_core.py
-${PYSITELIB}/bzrlib/selftest/test_merge_core.pyc
-${PYSITELIB}/bzrlib/selftest/test_merge_core.pyo
-${PYSITELIB}/bzrlib/selftest/test_parent.py
-${PYSITELIB}/bzrlib/selftest/test_parent.pyc
-${PYSITELIB}/bzrlib/selftest/test_parent.pyo
-${PYSITELIB}/bzrlib/selftest/test_revision_info.py
-${PYSITELIB}/bzrlib/selftest/test_revision_info.pyc
-${PYSITELIB}/bzrlib/selftest/test_revision_info.pyo
-${PYSITELIB}/bzrlib/selftest/test_smart_add.py
-${PYSITELIB}/bzrlib/selftest/test_smart_add.pyc
-${PYSITELIB}/bzrlib/selftest/test_smart_add.pyo
-${PYSITELIB}/bzrlib/selftest/test_upgrade.py
-${PYSITELIB}/bzrlib/selftest/test_upgrade.pyc
-${PYSITELIB}/bzrlib/selftest/test_upgrade.pyo
-${PYSITELIB}/bzrlib/selftest/test_weave.py
-${PYSITELIB}/bzrlib/selftest/test_weave.pyc
-${PYSITELIB}/bzrlib/selftest/test_weave.pyo
-${PYSITELIB}/bzrlib/selftest/test_xml.py
-${PYSITELIB}/bzrlib/selftest/test_xml.pyc
-${PYSITELIB}/bzrlib/selftest/test_xml.pyo
-${PYSITELIB}/bzrlib/selftest/testannotate.py
-${PYSITELIB}/bzrlib/selftest/testannotate.pyc
-${PYSITELIB}/bzrlib/selftest/testannotate.pyo
-${PYSITELIB}/bzrlib/selftest/testapi.py
-${PYSITELIB}/bzrlib/selftest/testapi.pyc
-${PYSITELIB}/bzrlib/selftest/testapi.pyo
-${PYSITELIB}/bzrlib/selftest/testbranch.py
-${PYSITELIB}/bzrlib/selftest/testbranch.pyc
-${PYSITELIB}/bzrlib/selftest/testbranch.pyo
-${PYSITELIB}/bzrlib/selftest/testconfig.py
-${PYSITELIB}/bzrlib/selftest/testconfig.pyc
-${PYSITELIB}/bzrlib/selftest/testconfig.pyo
-${PYSITELIB}/bzrlib/selftest/testdiff.py
-${PYSITELIB}/bzrlib/selftest/testdiff.pyc
-${PYSITELIB}/bzrlib/selftest/testdiff.pyo
-${PYSITELIB}/bzrlib/selftest/testfetch.py
-${PYSITELIB}/bzrlib/selftest/testfetch.pyc
-${PYSITELIB}/bzrlib/selftest/testfetch.pyo
-${PYSITELIB}/bzrlib/selftest/testgpg.py
-${PYSITELIB}/bzrlib/selftest/testgpg.pyc
-${PYSITELIB}/bzrlib/selftest/testgpg.pyo
-${PYSITELIB}/bzrlib/selftest/testgraph.py
-${PYSITELIB}/bzrlib/selftest/testgraph.pyc
-${PYSITELIB}/bzrlib/selftest/testgraph.pyo
-${PYSITELIB}/bzrlib/selftest/testhashcache.py
-${PYSITELIB}/bzrlib/selftest/testhashcache.pyc
-${PYSITELIB}/bzrlib/selftest/testhashcache.pyo
-${PYSITELIB}/bzrlib/selftest/testhttp.py
-${PYSITELIB}/bzrlib/selftest/testhttp.pyc
-${PYSITELIB}/bzrlib/selftest/testhttp.pyo
-${PYSITELIB}/bzrlib/selftest/testidentitymap.py
-${PYSITELIB}/bzrlib/selftest/testidentitymap.pyc
-${PYSITELIB}/bzrlib/selftest/testidentitymap.pyo
-${PYSITELIB}/bzrlib/selftest/testinv.py
-${PYSITELIB}/bzrlib/selftest/testinv.pyc
-${PYSITELIB}/bzrlib/selftest/testinv.pyo
-${PYSITELIB}/bzrlib/selftest/testlog.py
-${PYSITELIB}/bzrlib/selftest/testlog.pyc
-${PYSITELIB}/bzrlib/selftest/testlog.pyo
-${PYSITELIB}/bzrlib/selftest/testmerge.py
-${PYSITELIB}/bzrlib/selftest/testmerge.pyc
-${PYSITELIB}/bzrlib/selftest/testmerge.pyo
-${PYSITELIB}/bzrlib/selftest/testmerge3.py
-${PYSITELIB}/bzrlib/selftest/testmerge3.pyc
-${PYSITELIB}/bzrlib/selftest/testmerge3.pyo
-${PYSITELIB}/bzrlib/selftest/testnonascii.py
-${PYSITELIB}/bzrlib/selftest/testnonascii.pyc
-${PYSITELIB}/bzrlib/selftest/testnonascii.pyo
-${PYSITELIB}/bzrlib/selftest/testoptions.py
-${PYSITELIB}/bzrlib/selftest/testoptions.pyc
-${PYSITELIB}/bzrlib/selftest/testoptions.pyo
-${PYSITELIB}/bzrlib/selftest/testplugins.py
-${PYSITELIB}/bzrlib/selftest/testplugins.pyc
-${PYSITELIB}/bzrlib/selftest/testplugins.pyo
-${PYSITELIB}/bzrlib/selftest/testrevision.py
-${PYSITELIB}/bzrlib/selftest/testrevision.pyc
-${PYSITELIB}/bzrlib/selftest/testrevision.pyo
-${PYSITELIB}/bzrlib/selftest/testrevisionnamespaces.py
-${PYSITELIB}/bzrlib/selftest/testrevisionnamespaces.pyc
-${PYSITELIB}/bzrlib/selftest/testrevisionnamespaces.pyo
-${PYSITELIB}/bzrlib/selftest/testrevprops.py
-${PYSITELIB}/bzrlib/selftest/testrevprops.pyc
-${PYSITELIB}/bzrlib/selftest/testrevprops.pyo
-${PYSITELIB}/bzrlib/selftest/testreweave.py
-${PYSITELIB}/bzrlib/selftest/testreweave.pyc
-${PYSITELIB}/bzrlib/selftest/testreweave.pyo
-${PYSITELIB}/bzrlib/selftest/testsampler.py
-${PYSITELIB}/bzrlib/selftest/testsampler.pyc
-${PYSITELIB}/bzrlib/selftest/testsampler.pyo
-${PYSITELIB}/bzrlib/selftest/testsftp.py
-${PYSITELIB}/bzrlib/selftest/testsftp.pyc
-${PYSITELIB}/bzrlib/selftest/testsftp.pyo
-${PYSITELIB}/bzrlib/selftest/teststatus.py
-${PYSITELIB}/bzrlib/selftest/teststatus.pyc
-${PYSITELIB}/bzrlib/selftest/teststatus.pyo
-${PYSITELIB}/bzrlib/selftest/teststore.py
-${PYSITELIB}/bzrlib/selftest/teststore.pyc
-${PYSITELIB}/bzrlib/selftest/teststore.pyo
-${PYSITELIB}/bzrlib/selftest/testtestament.py
-${PYSITELIB}/bzrlib/selftest/testtestament.pyc
-${PYSITELIB}/bzrlib/selftest/testtestament.pyo
-${PYSITELIB}/bzrlib/selftest/testtransactions.py
-${PYSITELIB}/bzrlib/selftest/testtransactions.pyc
-${PYSITELIB}/bzrlib/selftest/testtransactions.pyo
-${PYSITELIB}/bzrlib/selftest/testtransport.py
-${PYSITELIB}/bzrlib/selftest/testtransport.pyc
-${PYSITELIB}/bzrlib/selftest/testtransport.pyo
-${PYSITELIB}/bzrlib/selftest/testtsort.py
-${PYSITELIB}/bzrlib/selftest/testtsort.pyc
-${PYSITELIB}/bzrlib/selftest/testtsort.pyo
-${PYSITELIB}/bzrlib/selftest/testworkingtree.py
-${PYSITELIB}/bzrlib/selftest/testworkingtree.pyc
-${PYSITELIB}/bzrlib/selftest/testworkingtree.pyo
-${PYSITELIB}/bzrlib/selftest/treeshape.py
-${PYSITELIB}/bzrlib/selftest/treeshape.pyc
-${PYSITELIB}/bzrlib/selftest/treeshape.pyo
-${PYSITELIB}/bzrlib/selftest/versioning.py
-${PYSITELIB}/bzrlib/selftest/versioning.pyc
-${PYSITELIB}/bzrlib/selftest/versioning.pyo
-${PYSITELIB}/bzrlib/selftest/whitebox.py
-${PYSITELIB}/bzrlib/selftest/whitebox.pyc
-${PYSITELIB}/bzrlib/selftest/whitebox.pyo
+${PYSITELIB}/bzrlib/rio.py
+${PYSITELIB}/bzrlib/rio.pyc
+${PYSITELIB}/bzrlib/rio.pyo
 ${PYSITELIB}/bzrlib/shellcomplete.py
 ${PYSITELIB}/bzrlib/shellcomplete.pyc
 ${PYSITELIB}/bzrlib/shellcomplete.pyo
@@ -294,18 +150,243 @@ ${PYSITELIB}/bzrlib/status.pyo
 ${PYSITELIB}/bzrlib/store/__init__.py
 ${PYSITELIB}/bzrlib/store/__init__.pyc
 ${PYSITELIB}/bzrlib/store/__init__.pyo
-${PYSITELIB}/bzrlib/store/compressed_text.py
-${PYSITELIB}/bzrlib/store/compressed_text.pyc
-${PYSITELIB}/bzrlib/store/compressed_text.pyo
 ${PYSITELIB}/bzrlib/store/text.py
 ${PYSITELIB}/bzrlib/store/text.pyc
 ${PYSITELIB}/bzrlib/store/text.pyo
 ${PYSITELIB}/bzrlib/store/weave.py
 ${PYSITELIB}/bzrlib/store/weave.pyc
 ${PYSITELIB}/bzrlib/store/weave.pyo
+${PYSITELIB}/bzrlib/symbol_versioning.py
+${PYSITELIB}/bzrlib/symbol_versioning.pyc
+${PYSITELIB}/bzrlib/symbol_versioning.pyo
 ${PYSITELIB}/bzrlib/testament.py
 ${PYSITELIB}/bzrlib/testament.pyc
 ${PYSITELIB}/bzrlib/testament.pyo
+${PYSITELIB}/bzrlib/tests/HTTPTestUtil.py
+${PYSITELIB}/bzrlib/tests/HTTPTestUtil.pyc
+${PYSITELIB}/bzrlib/tests/HTTPTestUtil.pyo
+${PYSITELIB}/bzrlib/tests/TestUtil.py
+${PYSITELIB}/bzrlib/tests/TestUtil.pyc
+${PYSITELIB}/bzrlib/tests/TestUtil.pyo
+${PYSITELIB}/bzrlib/tests/__init__.py
+${PYSITELIB}/bzrlib/tests/__init__.pyc
+${PYSITELIB}/bzrlib/tests/__init__.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/__init__.py
+${PYSITELIB}/bzrlib/tests/blackbox/__init__.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/__init__.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_added.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_added.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_added.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_cat.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_cat.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_cat.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_export.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_export.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_export.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_log.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_log.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_log.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_missing.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_missing.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_missing.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_pull.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_pull.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_pull.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_revision_info.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_revision_info.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_revision_info.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_revno.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_revno.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_revno.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_status.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_status.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_status.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_too_much.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_too_much.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_too_much.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_versioning.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_versioning.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_versioning.pyo
+${PYSITELIB}/bzrlib/tests/stub_sftp.py
+${PYSITELIB}/bzrlib/tests/stub_sftp.pyc
+${PYSITELIB}/bzrlib/tests/stub_sftp.pyo
+${PYSITELIB}/bzrlib/tests/test_ancestry.py
+${PYSITELIB}/bzrlib/tests/test_ancestry.pyc
+${PYSITELIB}/bzrlib/tests/test_ancestry.pyo
+${PYSITELIB}/bzrlib/tests/test_annotate.py
+${PYSITELIB}/bzrlib/tests/test_annotate.pyc
+${PYSITELIB}/bzrlib/tests/test_annotate.pyo
+${PYSITELIB}/bzrlib/tests/test_api.py
+${PYSITELIB}/bzrlib/tests/test_api.pyc
+${PYSITELIB}/bzrlib/tests/test_api.pyo
+${PYSITELIB}/bzrlib/tests/test_bad_files.py
+${PYSITELIB}/bzrlib/tests/test_bad_files.pyc
+${PYSITELIB}/bzrlib/tests/test_bad_files.pyo
+${PYSITELIB}/bzrlib/tests/test_basis_inventory.py
+${PYSITELIB}/bzrlib/tests/test_basis_inventory.pyc
+${PYSITELIB}/bzrlib/tests/test_basis_inventory.pyo
+${PYSITELIB}/bzrlib/tests/test_branch.py
+${PYSITELIB}/bzrlib/tests/test_branch.pyc
+${PYSITELIB}/bzrlib/tests/test_branch.pyo
+${PYSITELIB}/bzrlib/tests/test_command.py
+${PYSITELIB}/bzrlib/tests/test_command.pyc
+${PYSITELIB}/bzrlib/tests/test_command.pyo
+${PYSITELIB}/bzrlib/tests/test_commit.py
+${PYSITELIB}/bzrlib/tests/test_commit.pyc
+${PYSITELIB}/bzrlib/tests/test_commit.pyo
+${PYSITELIB}/bzrlib/tests/test_commit_merge.py
+${PYSITELIB}/bzrlib/tests/test_commit_merge.pyc
+${PYSITELIB}/bzrlib/tests/test_commit_merge.pyo
+${PYSITELIB}/bzrlib/tests/test_config.py
+${PYSITELIB}/bzrlib/tests/test_config.pyc
+${PYSITELIB}/bzrlib/tests/test_config.pyo
+${PYSITELIB}/bzrlib/tests/test_conflicts.py
+${PYSITELIB}/bzrlib/tests/test_conflicts.pyc
+${PYSITELIB}/bzrlib/tests/test_conflicts.pyo
+${PYSITELIB}/bzrlib/tests/test_diff.py
+${PYSITELIB}/bzrlib/tests/test_diff.pyc
+${PYSITELIB}/bzrlib/tests/test_diff.pyo
+${PYSITELIB}/bzrlib/tests/test_fetch.py
+${PYSITELIB}/bzrlib/tests/test_fetch.pyc
+${PYSITELIB}/bzrlib/tests/test_fetch.pyo
+${PYSITELIB}/bzrlib/tests/test_gpg.py
+${PYSITELIB}/bzrlib/tests/test_gpg.pyc
+${PYSITELIB}/bzrlib/tests/test_gpg.pyo
+${PYSITELIB}/bzrlib/tests/test_graph.py
+${PYSITELIB}/bzrlib/tests/test_graph.pyc
+${PYSITELIB}/bzrlib/tests/test_graph.pyo
+${PYSITELIB}/bzrlib/tests/test_hashcache.py
+${PYSITELIB}/bzrlib/tests/test_hashcache.pyc
+${PYSITELIB}/bzrlib/tests/test_hashcache.pyo
+${PYSITELIB}/bzrlib/tests/test_http.py
+${PYSITELIB}/bzrlib/tests/test_http.pyc
+${PYSITELIB}/bzrlib/tests/test_http.pyo
+${PYSITELIB}/bzrlib/tests/test_identitymap.py
+${PYSITELIB}/bzrlib/tests/test_identitymap.pyc
+${PYSITELIB}/bzrlib/tests/test_identitymap.pyo
+${PYSITELIB}/bzrlib/tests/test_inv.py
+${PYSITELIB}/bzrlib/tests/test_inv.pyc
+${PYSITELIB}/bzrlib/tests/test_inv.pyo
+${PYSITELIB}/bzrlib/tests/test_log.py
+${PYSITELIB}/bzrlib/tests/test_log.pyc
+${PYSITELIB}/bzrlib/tests/test_log.pyo
+${PYSITELIB}/bzrlib/tests/test_merge.py
+${PYSITELIB}/bzrlib/tests/test_merge.pyc
+${PYSITELIB}/bzrlib/tests/test_merge.pyo
+${PYSITELIB}/bzrlib/tests/test_merge3.py
+${PYSITELIB}/bzrlib/tests/test_merge3.pyc
+${PYSITELIB}/bzrlib/tests/test_merge3.pyo
+${PYSITELIB}/bzrlib/tests/test_merge_core.py
+${PYSITELIB}/bzrlib/tests/test_merge_core.pyc
+${PYSITELIB}/bzrlib/tests/test_merge_core.pyo
+${PYSITELIB}/bzrlib/tests/test_missing.py
+${PYSITELIB}/bzrlib/tests/test_missing.pyc
+${PYSITELIB}/bzrlib/tests/test_missing.pyo
+${PYSITELIB}/bzrlib/tests/test_msgeditor.py
+${PYSITELIB}/bzrlib/tests/test_msgeditor.pyc
+${PYSITELIB}/bzrlib/tests/test_msgeditor.pyo
+${PYSITELIB}/bzrlib/tests/test_nonascii.py
+${PYSITELIB}/bzrlib/tests/test_nonascii.pyc
+${PYSITELIB}/bzrlib/tests/test_nonascii.pyo
+${PYSITELIB}/bzrlib/tests/test_options.py
+${PYSITELIB}/bzrlib/tests/test_options.pyc
+${PYSITELIB}/bzrlib/tests/test_options.pyo
+${PYSITELIB}/bzrlib/tests/test_osutils.py
+${PYSITELIB}/bzrlib/tests/test_osutils.pyc
+${PYSITELIB}/bzrlib/tests/test_osutils.pyo
+${PYSITELIB}/bzrlib/tests/test_parent.py
+${PYSITELIB}/bzrlib/tests/test_parent.pyc
+${PYSITELIB}/bzrlib/tests/test_parent.pyo
+${PYSITELIB}/bzrlib/tests/test_permissions.py
+${PYSITELIB}/bzrlib/tests/test_permissions.pyc
+${PYSITELIB}/bzrlib/tests/test_permissions.pyo
+${PYSITELIB}/bzrlib/tests/test_plugins.py
+${PYSITELIB}/bzrlib/tests/test_plugins.pyc
+${PYSITELIB}/bzrlib/tests/test_plugins.pyo
+${PYSITELIB}/bzrlib/tests/test_remove.py
+${PYSITELIB}/bzrlib/tests/test_remove.pyc
+${PYSITELIB}/bzrlib/tests/test_remove.pyo
+${PYSITELIB}/bzrlib/tests/test_revision.py
+${PYSITELIB}/bzrlib/tests/test_revision.pyc
+${PYSITELIB}/bzrlib/tests/test_revision.pyo
+${PYSITELIB}/bzrlib/tests/test_revisionnamespaces.py
+${PYSITELIB}/bzrlib/tests/test_revisionnamespaces.pyc
+${PYSITELIB}/bzrlib/tests/test_revisionnamespaces.pyo
+${PYSITELIB}/bzrlib/tests/test_revprops.py
+${PYSITELIB}/bzrlib/tests/test_revprops.pyc
+${PYSITELIB}/bzrlib/tests/test_revprops.pyo
+${PYSITELIB}/bzrlib/tests/test_reweave.py
+${PYSITELIB}/bzrlib/tests/test_reweave.pyc
+${PYSITELIB}/bzrlib/tests/test_reweave.pyo
+${PYSITELIB}/bzrlib/tests/test_rio.py
+${PYSITELIB}/bzrlib/tests/test_rio.pyc
+${PYSITELIB}/bzrlib/tests/test_rio.pyo
+${PYSITELIB}/bzrlib/tests/test_sampler.py
+${PYSITELIB}/bzrlib/tests/test_sampler.pyc
+${PYSITELIB}/bzrlib/tests/test_sampler.pyo
+${PYSITELIB}/bzrlib/tests/test_selftest.py
+${PYSITELIB}/bzrlib/tests/test_selftest.pyc
+${PYSITELIB}/bzrlib/tests/test_selftest.pyo
+${PYSITELIB}/bzrlib/tests/test_setup.py
+${PYSITELIB}/bzrlib/tests/test_setup.pyc
+${PYSITELIB}/bzrlib/tests/test_setup.pyo
+${PYSITELIB}/bzrlib/tests/test_sftp_transport.py
+${PYSITELIB}/bzrlib/tests/test_sftp_transport.pyc
+${PYSITELIB}/bzrlib/tests/test_sftp_transport.pyo
+${PYSITELIB}/bzrlib/tests/test_smart_add.py
+${PYSITELIB}/bzrlib/tests/test_smart_add.pyc
+${PYSITELIB}/bzrlib/tests/test_smart_add.pyo
+${PYSITELIB}/bzrlib/tests/test_source.py
+${PYSITELIB}/bzrlib/tests/test_source.pyc
+${PYSITELIB}/bzrlib/tests/test_source.pyo
+${PYSITELIB}/bzrlib/tests/test_status.py
+${PYSITELIB}/bzrlib/tests/test_status.pyc
+${PYSITELIB}/bzrlib/tests/test_status.pyo
+${PYSITELIB}/bzrlib/tests/test_store.py
+${PYSITELIB}/bzrlib/tests/test_store.pyc
+${PYSITELIB}/bzrlib/tests/test_store.pyo
+${PYSITELIB}/bzrlib/tests/test_symbol_versioning.py
+${PYSITELIB}/bzrlib/tests/test_symbol_versioning.pyc
+${PYSITELIB}/bzrlib/tests/test_symbol_versioning.pyo
+${PYSITELIB}/bzrlib/tests/test_testament.py
+${PYSITELIB}/bzrlib/tests/test_testament.pyc
+${PYSITELIB}/bzrlib/tests/test_testament.pyo
+${PYSITELIB}/bzrlib/tests/test_trace.py
+${PYSITELIB}/bzrlib/tests/test_trace.pyc
+${PYSITELIB}/bzrlib/tests/test_trace.pyo
+${PYSITELIB}/bzrlib/tests/test_transactions.py
+${PYSITELIB}/bzrlib/tests/test_transactions.pyc
+${PYSITELIB}/bzrlib/tests/test_transactions.pyo
+${PYSITELIB}/bzrlib/tests/test_transport.py
+${PYSITELIB}/bzrlib/tests/test_transport.pyc
+${PYSITELIB}/bzrlib/tests/test_transport.pyo
+${PYSITELIB}/bzrlib/tests/test_tsort.py
+${PYSITELIB}/bzrlib/tests/test_tsort.pyc
+${PYSITELIB}/bzrlib/tests/test_tsort.pyo
+${PYSITELIB}/bzrlib/tests/test_ui.py
+${PYSITELIB}/bzrlib/tests/test_ui.pyc
+${PYSITELIB}/bzrlib/tests/test_ui.pyo
+${PYSITELIB}/bzrlib/tests/test_uncommit.py
+${PYSITELIB}/bzrlib/tests/test_uncommit.pyc
+${PYSITELIB}/bzrlib/tests/test_uncommit.pyo
+${PYSITELIB}/bzrlib/tests/test_upgrade.py
+${PYSITELIB}/bzrlib/tests/test_upgrade.pyc
+${PYSITELIB}/bzrlib/tests/test_upgrade.pyo
+${PYSITELIB}/bzrlib/tests/test_weave.py
+${PYSITELIB}/bzrlib/tests/test_weave.pyc
+${PYSITELIB}/bzrlib/tests/test_weave.pyo
+${PYSITELIB}/bzrlib/tests/test_whitebox.py
+${PYSITELIB}/bzrlib/tests/test_whitebox.pyc
+${PYSITELIB}/bzrlib/tests/test_whitebox.pyo
+${PYSITELIB}/bzrlib/tests/test_workingtree.py
+${PYSITELIB}/bzrlib/tests/test_workingtree.pyc
+${PYSITELIB}/bzrlib/tests/test_workingtree.pyo
+${PYSITELIB}/bzrlib/tests/test_xml.py
+${PYSITELIB}/bzrlib/tests/test_xml.pyc
+${PYSITELIB}/bzrlib/tests/test_xml.pyo
+${PYSITELIB}/bzrlib/tests/treeshape.py
+${PYSITELIB}/bzrlib/tests/treeshape.pyc
+${PYSITELIB}/bzrlib/tests/treeshape.pyo
 ${PYSITELIB}/bzrlib/textinv.py
 ${PYSITELIB}/bzrlib/textinv.pyc
 ${PYSITELIB}/bzrlib/textinv.pyo
@@ -321,6 +402,9 @@ ${PYSITELIB}/bzrlib/transactions.pyo
 ${PYSITELIB}/bzrlib/transport/__init__.py
 ${PYSITELIB}/bzrlib/transport/__init__.pyc
 ${PYSITELIB}/bzrlib/transport/__init__.pyo
+${PYSITELIB}/bzrlib/transport/ftp.py
+${PYSITELIB}/bzrlib/transport/ftp.pyc
+${PYSITELIB}/bzrlib/transport/ftp.pyo
 ${PYSITELIB}/bzrlib/transport/http.py
 ${PYSITELIB}/bzrlib/transport/http.pyc
 ${PYSITELIB}/bzrlib/transport/http.pyo
@@ -339,9 +423,15 @@ ${PYSITELIB}/bzrlib/tree.pyo
 ${PYSITELIB}/bzrlib/tsort.py
 ${PYSITELIB}/bzrlib/tsort.pyc
 ${PYSITELIB}/bzrlib/tsort.pyo
-${PYSITELIB}/bzrlib/ui.py
-${PYSITELIB}/bzrlib/ui.pyc
-${PYSITELIB}/bzrlib/ui.pyo
+${PYSITELIB}/bzrlib/ui/__init__.py
+${PYSITELIB}/bzrlib/ui/__init__.pyc
+${PYSITELIB}/bzrlib/ui/__init__.pyo
+${PYSITELIB}/bzrlib/ui/text.py
+${PYSITELIB}/bzrlib/ui/text.pyc
+${PYSITELIB}/bzrlib/ui/text.pyo
+${PYSITELIB}/bzrlib/uncommit.py
+${PYSITELIB}/bzrlib/uncommit.pyc
+${PYSITELIB}/bzrlib/uncommit.pyo
 ${PYSITELIB}/bzrlib/upgrade.py
 ${PYSITELIB}/bzrlib/upgrade.pyc
 ${PYSITELIB}/bzrlib/upgrade.pyo
@@ -396,6 +486,7 @@ ${PYSITELIB}/bzrlib/xml4.pyo
 ${PYSITELIB}/bzrlib/xml5.py
 ${PYSITELIB}/bzrlib/xml5.pyc
 ${PYSITELIB}/bzrlib/xml5.pyo
+man/man1/bzr.1
 share/doc/bzr/adoption.txt
 share/doc/bzr/bitkeeper.txt
 share/doc/bzr/changelogs.txt
@@ -470,8 +561,11 @@ share/doc/bzr/yaml.txt
 @dirrm ${PYSITELIB}/bzrlib/util/effbot
 @dirrm ${PYSITELIB}/bzrlib/util/configobj
 @dirrm ${PYSITELIB}/bzrlib/util
+@dirrm ${PYSITELIB}/bzrlib/ui
 @dirrm ${PYSITELIB}/bzrlib/transport
+@dirrm ${PYSITELIB}/bzrlib/tests/blackbox
+@dirrm ${PYSITELIB}/bzrlib/tests
 @dirrm ${PYSITELIB}/bzrlib/store
-@dirrm ${PYSITELIB}/bzrlib/selftest
 @dirrm ${PYSITELIB}/bzrlib/plugins
+@dirrm ${PYSITELIB}/bzrlib/export
 @dirrm ${PYSITELIB}/bzrlib
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 214d252cf82..e96c698b0b7 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/01/15 00:22:12 wiz Exp $
+$NetBSD: distinfo,v 1.2 2006/01/25 20:17:57 wiz Exp $
 
-SHA1 (bzr-0.6.2.tar.gz) = bc75b61b55c73105eeba02cb4b65db3aa00e33c8
-RMD160 (bzr-0.6.2.tar.gz) = 1f25e125f94a409cf853dbd75c02017b57d1be6a
-Size (bzr-0.6.2.tar.gz) = 519926 bytes
+SHA1 (bzr-0.7.tar.gz) = 941a0800e967aa389776800dfa2f58b03b9e0750
+RMD160 (bzr-0.7.tar.gz) = e207ed79ffd9e88e5f7ab4b618bd584f4734fff4
+Size (bzr-0.7.tar.gz) = 569679 bytes