Update to 0.8.2. Add test target. Add py-expat dependency.

Generate and install man page.

bzr 0.8.2  2006-05-17

  BUG FIXES:

    * setup.py failed to install launchpad plugin.  (Martin Pool)

bzr 0.8.1  2006-05-16

  BUG FIXES:

    * Fix failure to commit a merge in a checkout.  (Martin Pool,
      Robert Collins, Erik Bågfors, #43959)

    * Nicer messages from 'commit' in the case of renames, and correct
      messages when a merge has occured. (Robert Collins, Martin Pool)

    * Separate functionality from assert statements as they are skipped in
      optimized mode of python. Add the same check to pending merges.
      (#44443, Olaf Conradi)

  CHANGES:

    * Do not show the None revision in output of bzr ancestry. (Olaf Conradi)

    * Add info on standalone branches without a working tree.
      (#44155, Olaf Conradi)

    * Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)

  CHANGES:

    * Make editor invocation comply with Debian Policy. First check
      environment variables VISUAL and EDITOR, then try editor from
      alternatives system. If that all fails, fall back to the pre-defined
      list of editors. (#42904, Olaf Conradi)

  NEW FEATURES:

    * New 'register-branch' command registers a public branch into
      Launchpad.net, where it can be associated with bugs, etc.
      (Martin Pool, Bjorn Tillenius, Robert Collins)

  TESTING:

    * Fix test case for bzr info in upgrading a standalone branch to metadir,
      uses bzrlib api now. (Olaf Conradi)

bzr 0.8  2006-05-08

  NOTES WHEN UPGRADING:

    Release 0.8 of bzr introduces a new format for history storage, called
    'knit', as an evolution of to the 'weave' format used in 0.7.  Local
    and remote operations are faster using knits than weaves.  Several
    operations including 'init', 'init-repo', and 'upgrade' take a
    --format option that controls this.  Branching from an existing branch
    will keep the same format.

    It is possible to merge, pull and push between branches of different
    formats but this is slower than moving data between homogenous
    branches.  It is therefore recommended (but not required) that you
    upgrade all branches for a project at the same time.  Information on
    formats is shown by 'bzr info'.

    bzr 0.8 now allows creation of 'repositories', which hold the history
    of files and revisions for several branches.  Previously bzr kept all
    the history for a branch within the .bzr directory at the root of the
    branch, and this is still the default.  To create a repository, use
    the new 'bzr init-repo' command.  Branches exist as directories under
    the repository and contain just a small amount of information
    indicating the current revision of the branch.

    bzr 0.8 also supports 'checkouts', which are similar to in cvs and
    subversion.  Checkouts are associated with a branch (optionally in a
    repository), which contains all the historical information.  The
    result is that a checkout can be deleted without losing any
    already-committed revisions.  A new 'update' command is also available.

    Repositories and checkouts are not supported with the 0.7 storage
    format.  To use them you must upgrad to either knits, or to the
    'metaweave' format, which uses weaves but changes the .bzr directory
    arrangement.


  IMPROVEMENTS:

    * Sftp paths can now be relative, or local, according to the lftp
      convention. Paths now take the form:
      sftp://user:pass@host:port/~/relative/path
      or
      sftp://user:pass@host:port/absolute/path

    * The FTP transport now tries to reconnect after a temporary
      failure. ftp put is made atomic. (Matthieu Moy)

    * The FTP transport now maintains a pool of connections, and
      reuses them to avoid multiple connections to the same host (like
      sftp did). (Daniel Silverstone)

    * The bzr_man.py file has been removed. To create the man page now,
      use ./generate_docs.py man. The new program can also create other files.
      Run "python generate_docs.py --help" for usage information. (Hans
      Ulrich Niedermann & James Blackwell).

    * Man Page now gives full help (James Blackwell). Help also updated to
      reflect user config now being stored in .bazaar (Hans Ulrich
      Niedermann)

    * It's now possible to set aliases in bazaar.conf (Erik Bågfors)

    * Pull now accepts a --revision argument (Erik Bågfors)

    * 'bzr re-sign' now allows multiple revisions to be supplied on the command
      line. You can now use the following command to sign all of your old commits.
        find .bzr/revision-store// -name my@email-* \
          | sed 's/.*\/\/..\///' \
          | xargs bzr re-sign

    * Upgrade can now upgrade over the network. (Robert Collins)

    * Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
      behaviour.  By default they will cache history in the checkout, but
      with --lightweight almost all data is kept in the master branch.
      (Robert Collins)

    * 'revert' unversions newly-versioned files, instead of deleting them.

    * 'merge' is more robust.  Conflict messages have changed.

    * 'merge' and 'revert' no longer clobber existing files that end in '~' or
      '.moved'.

    * Default log format can be set in configuration and plugins can register
      their own formatters. (Erik Bågfors)

    * New 'reconcile' command will check branch consistency and repair indexes
      that can become out of sync in pre 0.8 formats. (Robert Collins,
      Daniel Silverstone)

    * New 'bzr init --format' and 'bzr upgrade --format' option to control
      what storage format is created or produced.  (Robert Collins,
      Martin Pool)

    * Add parent location to 'bzr info', if there is one.  (Olaf Conradi)

    * New developer commands 'weave-list' and 'weave-join'.  (Martin Pool)

    * New 'init-repository' command, plus support for repositories in 'init'
      and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)

    * Improve output of 'info' command. Show all relevant locations related to
      working tree, branch and repository. Use kibibytes for binary quantities.
      Fix off-by-one error in missing revisions of working tree.  Make 'info'
      work on branches, repositories and remote locations.  Show locations
      relative to the shared repository, if applicable.  Show locking status
      of locations.  (Olaf Conradi)

    * Diff and merge now safely handle binary files. (Aaron Bentley)

    * 'pull' and 'push' now normalise the revision history, so that any two
      branches with the same tip revision will have the same output from 'log'.
      (Robert Collins)

    * 'merge' accepts --remember option to store parent location, like 'push'
      and 'pull'. (Olaf Conradi)

    * bzr status and diff when files given as arguments do not exist
      in the relevant trees.  (Martin Pool, #3619)

    * Add '.hg' to the default ignore list.  (Martin Pool)

    * 'knit' is now the default disk format. This improves disk performance and
      utilization, increases incremental pull performance, robustness with SFTP
      and allows checkouts over SFTP to perform acceptably.
      The initial Knit code was contributed by Johan Rydberg based on a
      specification by Martin Pool.
      (Robert Collins, Aaron Bentley, John Rydberg, Martin Pool).

    * New tool to generate all-in-one html version of the manual.  (Alexander
      Belchenko)

    * Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
      to be left in the SFTP repository. (Robert Collins, Martin Pool).

    * New option 'diff --prefix' to control how files are named in diff
      output, with shortcuts '-p0' and '-p1' corresponding to the options for
      GNU patch.  (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)

    * Add --revision option to 'annotate' command.  (Olaf Conradi)

    * If bzr shows an unexpected revision-history after pulling (perhaps due
      to a reweave) it can now be corrected by 'bzr reconcile'.
      (Robert Collins)

  CHANGES:

    * Commit is now verbose by default, and shows changed filenames and the
      new revision number.  (Robert Collins, Martin Pool)

    * Unify 'mv', 'move', 'rename'.  (#5379, Matthew Fuller)

    * 'bzr -h' shows help.  (#35940, Martin Pool, Ian Bicking)

    * Make 'pull' and 'push' remember location on failure using --remember.
      (Olaf Conradi)

    * For compatibility, make old format for using weaves inside metadir
      available as 'metaweave' format.  Rename format 'metadir' to 'default'.
      Clean up help for option --format in commands 'init', 'init-repo' and
      'upgrade'.  (Olaf Conradi)

  TESTING:

    * SFTP tests now shortcut the SSH negotiation, reducing test overhead
      for testing SFTP protocol support. (Robey Pointer)

    * Branch formats are now tested once per implementation (see bzrlib.
      tests.branch_implementations. This is analagous to the transport
      interface tests, and has been followed up with working tree,
      repository and BzrDir tests. (Robert Collins)

    * New test base class TestCaseWithTransport provides a transport aware
      test environment, useful for testing any transport-interface using
      code. The test suite option --transport controls the transport used
      by this class (when its not being used as part of implementation
      contract testing). (Robert Collins)

    * Close logging handler on disabling the test log. This will remove the
      handler from the internal list inside python's logging module,
      preventing shutdown from closing it twice.  (Olaf Conradi)

    * Move test case for uncommit to blackbox tests.  (Olaf Conradi)

    * run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
      will provide String("foo") to the command as its stdin.

3 files changed, 346 insertions, 115 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index e5454ce09e0..57b2251b6db 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:29:12 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/07/12 14:30:55 wiz Exp $
 #
 
-DISTNAME=		bzr-0.7
-PKGREVISION=		1
+DISTNAME=		bzr-0.8.2
 CATEGORIES=		devel
 MASTER_SITES=		http://www.bazaar-ng.org/pkg/
 
@@ -10,15 +9,22 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.bazaar-ng.org/
 COMMENT=		Open source distributed version control system (Bazaar-NG)
 
+DEPENDS+=		${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
+
 PY_PATCHPLIST=          yes
 PYDISTUTILSPKG=		yes
+TEST_TARGET=		check
 
 PYTHON_VERSIONS_ACCEPTED=	24
+PYTHON_PATCH_SCRIPTS=		bzr
+
+post-build:
+	cd ${WRKSRC} && ${PYTHONBIN} generate_docs.py man
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bzr
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt  ${PREFIX}/share/doc/bzr
-	${INSTALL_DATA} ${WRKSRC}/tutorial.txt  ${PREFIX}/share/doc/bzr
 
+.include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index 6a260c2e348..ef4c2986567 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/25 20:17:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/07/12 14:30:55 wiz Exp $
 bin/bzr
+man/man1/bzr.1
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
 ${PYSITELIB}/bzrlib/__init__.pyo
@@ -18,15 +19,12 @@ ${PYSITELIB}/bzrlib/branch.pyo
 ${PYSITELIB}/bzrlib/builtins.py
 ${PYSITELIB}/bzrlib/builtins.pyc
 ${PYSITELIB}/bzrlib/builtins.pyo
-${PYSITELIB}/bzrlib/changeset.py
-${PYSITELIB}/bzrlib/changeset.pyc
-${PYSITELIB}/bzrlib/changeset.pyo
+${PYSITELIB}/bzrlib/bzrdir.py
+${PYSITELIB}/bzrlib/bzrdir.pyc
+${PYSITELIB}/bzrlib/bzrdir.pyo
 ${PYSITELIB}/bzrlib/check.py
 ${PYSITELIB}/bzrlib/check.pyc
 ${PYSITELIB}/bzrlib/check.pyo
-${PYSITELIB}/bzrlib/clone.py
-${PYSITELIB}/bzrlib/clone.pyc
-${PYSITELIB}/bzrlib/clone.pyo
 ${PYSITELIB}/bzrlib/commands.py
 ${PYSITELIB}/bzrlib/commands.pyc
 ${PYSITELIB}/bzrlib/commands.pyo
@@ -39,12 +37,21 @@ ${PYSITELIB}/bzrlib/config.pyo
 ${PYSITELIB}/bzrlib/conflicts.py
 ${PYSITELIB}/bzrlib/conflicts.pyc
 ${PYSITELIB}/bzrlib/conflicts.pyo
+${PYSITELIB}/bzrlib/decorators.py
+${PYSITELIB}/bzrlib/decorators.pyc
+${PYSITELIB}/bzrlib/decorators.pyo
 ${PYSITELIB}/bzrlib/delta.py
 ${PYSITELIB}/bzrlib/delta.pyc
 ${PYSITELIB}/bzrlib/delta.pyo
 ${PYSITELIB}/bzrlib/diff.py
 ${PYSITELIB}/bzrlib/diff.pyc
 ${PYSITELIB}/bzrlib/diff.pyo
+${PYSITELIB}/bzrlib/doc/__init__.py
+${PYSITELIB}/bzrlib/doc/__init__.pyc
+${PYSITELIB}/bzrlib/doc/__init__.pyo
+${PYSITELIB}/bzrlib/doc/api/__init__.py
+${PYSITELIB}/bzrlib/doc/api/__init__.pyc
+${PYSITELIB}/bzrlib/doc/api/__init__.pyo
 ${PYSITELIB}/bzrlib/errors.py
 ${PYSITELIB}/bzrlib/errors.pyc
 ${PYSITELIB}/bzrlib/errors.pyo
@@ -84,15 +91,30 @@ ${PYSITELIB}/bzrlib/identitymap.pyo
 ${PYSITELIB}/bzrlib/info.py
 ${PYSITELIB}/bzrlib/info.pyc
 ${PYSITELIB}/bzrlib/info.pyo
+${PYSITELIB}/bzrlib/inter.py
+${PYSITELIB}/bzrlib/inter.pyc
+${PYSITELIB}/bzrlib/inter.pyo
 ${PYSITELIB}/bzrlib/intset.py
 ${PYSITELIB}/bzrlib/intset.pyc
 ${PYSITELIB}/bzrlib/intset.pyo
 ${PYSITELIB}/bzrlib/inventory.py
 ${PYSITELIB}/bzrlib/inventory.pyc
 ${PYSITELIB}/bzrlib/inventory.pyo
+${PYSITELIB}/bzrlib/iterablefile.py
+${PYSITELIB}/bzrlib/iterablefile.pyc
+${PYSITELIB}/bzrlib/iterablefile.pyo
+${PYSITELIB}/bzrlib/knit.py
+${PYSITELIB}/bzrlib/knit.pyc
+${PYSITELIB}/bzrlib/knit.pyo
 ${PYSITELIB}/bzrlib/lock.py
 ${PYSITELIB}/bzrlib/lock.pyc
 ${PYSITELIB}/bzrlib/lock.pyo
+${PYSITELIB}/bzrlib/lockable_files.py
+${PYSITELIB}/bzrlib/lockable_files.pyc
+${PYSITELIB}/bzrlib/lockable_files.pyo
+${PYSITELIB}/bzrlib/lockdir.py
+${PYSITELIB}/bzrlib/lockdir.pyc
+${PYSITELIB}/bzrlib/lockdir.pyo
 ${PYSITELIB}/bzrlib/log.py
 ${PYSITELIB}/bzrlib/log.pyc
 ${PYSITELIB}/bzrlib/log.pyo
@@ -105,9 +127,6 @@ ${PYSITELIB}/bzrlib/merge.pyo
 ${PYSITELIB}/bzrlib/merge3.py
 ${PYSITELIB}/bzrlib/merge3.pyc
 ${PYSITELIB}/bzrlib/merge3.pyo
-${PYSITELIB}/bzrlib/merge_core.py
-${PYSITELIB}/bzrlib/merge_core.pyc
-${PYSITELIB}/bzrlib/merge_core.pyo
 ${PYSITELIB}/bzrlib/missing.py
 ${PYSITELIB}/bzrlib/missing.pyc
 ${PYSITELIB}/bzrlib/missing.pyo
@@ -129,9 +148,24 @@ ${PYSITELIB}/bzrlib/plugin.pyo
 ${PYSITELIB}/bzrlib/plugins/__init__.py
 ${PYSITELIB}/bzrlib/plugins/__init__.pyc
 ${PYSITELIB}/bzrlib/plugins/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/launchpad/__init__.py
+${PYSITELIB}/bzrlib/plugins/launchpad/__init__.pyc
+${PYSITELIB}/bzrlib/plugins/launchpad/__init__.pyo
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_registration.py
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_registration.pyc
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_registration.pyo
+${PYSITELIB}/bzrlib/plugins/launchpad/test_register.py
+${PYSITELIB}/bzrlib/plugins/launchpad/test_register.pyc
+${PYSITELIB}/bzrlib/plugins/launchpad/test_register.pyo
 ${PYSITELIB}/bzrlib/progress.py
 ${PYSITELIB}/bzrlib/progress.pyc
 ${PYSITELIB}/bzrlib/progress.pyo
+${PYSITELIB}/bzrlib/reconcile.py
+${PYSITELIB}/bzrlib/reconcile.pyc
+${PYSITELIB}/bzrlib/reconcile.pyo
+${PYSITELIB}/bzrlib/repository.py
+${PYSITELIB}/bzrlib/repository.pyc
+${PYSITELIB}/bzrlib/repository.pyo
 ${PYSITELIB}/bzrlib/revision.py
 ${PYSITELIB}/bzrlib/revision.pyc
 ${PYSITELIB}/bzrlib/revision.pyo
@@ -144,18 +178,30 @@ ${PYSITELIB}/bzrlib/rio.pyo
 ${PYSITELIB}/bzrlib/shellcomplete.py
 ${PYSITELIB}/bzrlib/shellcomplete.pyc
 ${PYSITELIB}/bzrlib/shellcomplete.pyo
+${PYSITELIB}/bzrlib/sign_my_commits.py
+${PYSITELIB}/bzrlib/sign_my_commits.pyc
+${PYSITELIB}/bzrlib/sign_my_commits.pyo
 ${PYSITELIB}/bzrlib/status.py
 ${PYSITELIB}/bzrlib/status.pyc
 ${PYSITELIB}/bzrlib/status.pyo
 ${PYSITELIB}/bzrlib/store/__init__.py
 ${PYSITELIB}/bzrlib/store/__init__.pyc
 ${PYSITELIB}/bzrlib/store/__init__.pyo
+${PYSITELIB}/bzrlib/store/revision/__init__.py
+${PYSITELIB}/bzrlib/store/revision/__init__.pyc
+${PYSITELIB}/bzrlib/store/revision/__init__.pyo
+${PYSITELIB}/bzrlib/store/revision/knit.py
+${PYSITELIB}/bzrlib/store/revision/knit.pyc
+${PYSITELIB}/bzrlib/store/revision/knit.pyo
+${PYSITELIB}/bzrlib/store/revision/text.py
+${PYSITELIB}/bzrlib/store/revision/text.pyc
+${PYSITELIB}/bzrlib/store/revision/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/store/versioned/__init__.py
+${PYSITELIB}/bzrlib/store/versioned/__init__.pyc
+${PYSITELIB}/bzrlib/store/versioned/__init__.pyo
 ${PYSITELIB}/bzrlib/symbol_versioning.py
 ${PYSITELIB}/bzrlib/symbol_versioning.pyc
 ${PYSITELIB}/bzrlib/symbol_versioning.pyo
@@ -177,57 +223,195 @@ ${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_aliases.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_aliases.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_aliases.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_ancestry.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_ancestry.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_ancestry.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_annotate.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_annotate.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_annotate.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_bound_branches.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_bound_branches.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_bound_branches.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_break_lock.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_checkout.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_checkout.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_checkout.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_commit.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_commit.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_commit.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_conflicts.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_conflicts.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_conflicts.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_diff.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_diff.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_diff.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_find_merge_base.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_find_merge_base.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_find_merge_base.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_help.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_help.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_help.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_info.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_info.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_info.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_init.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_init.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_init.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_logformats.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_logformats.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_logformats.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_merge.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_merge.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_merge.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_outside_wt.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_outside_wt.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_outside_wt.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_push.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_push.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_push.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_re_sign.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_re_sign.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_re_sign.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_reconcile.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_reconcile.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_reconcile.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_revert.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_revert.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_revert.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_selftest.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_selftest.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_selftest.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_shared_repository.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_shared_repository.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_shared_repository.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_sign_my_commits.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_sign_my_commits.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_sign_my_commits.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_uncommit.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_uncommit.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_uncommit.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_update.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_update.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_update.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_upgrade.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_upgrade.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_upgrade.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/branch_implementations/__init__.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/__init__.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/__init__.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_bound_sftp.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_bound_sftp.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_bound_sftp.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_branch.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_branch.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_branch.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_break_lock.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_break_lock.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_break_lock.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_parent.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_parent.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_parent.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_permissions.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_permissions.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_permissions.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_pull.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_pull.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_pull.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_update.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_update.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_update.pyo
+${PYSITELIB}/bzrlib/tests/bzrdir_implementations/__init__.py
+${PYSITELIB}/bzrlib/tests/bzrdir_implementations/__init__.pyc
+${PYSITELIB}/bzrlib/tests/bzrdir_implementations/__init__.pyo
+${PYSITELIB}/bzrlib/tests/bzrdir_implementations/test_bzrdir.py
+${PYSITELIB}/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyc
+${PYSITELIB}/bzrlib/tests/bzrdir_implementations/test_bzrdir.pyo
+${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.py
+${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.pyc
+${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.pyo
+${PYSITELIB}/bzrlib/tests/interrepository_implementations/test_interrepository.py
+${PYSITELIB}/bzrlib/tests/interrepository_implementations/test_interrepository.pyc
+${PYSITELIB}/bzrlib/tests/interrepository_implementations/test_interrepository.pyo
+${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/__init__.py
+${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/__init__.pyc
+${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/__init__.pyo
+${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/test_join.py
+${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/test_join.pyc
+${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/test_join.pyo
+${PYSITELIB}/bzrlib/tests/repository_implementations/__init__.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/__init__.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/__init__.pyo
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_break_lock.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_break_lock.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_break_lock.pyo
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_fileid_involved.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_fileid_involved.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_fileid_involved.pyo
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_reconcile.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_reconcile.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_reconcile.pyo
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_repository.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_repository.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_repository.pyo
+${PYSITELIB}/bzrlib/tests/revisionstore_implementations/__init__.py
+${PYSITELIB}/bzrlib/tests/revisionstore_implementations/__init__.pyc
+${PYSITELIB}/bzrlib/tests/revisionstore_implementations/__init__.pyo
+${PYSITELIB}/bzrlib/tests/revisionstore_implementations/test_all.py
+${PYSITELIB}/bzrlib/tests/revisionstore_implementations/test_all.pyc
+${PYSITELIB}/bzrlib/tests/revisionstore_implementations/test_all.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_bzrdir.py
+${PYSITELIB}/bzrlib/tests/test_bzrdir.pyc
+${PYSITELIB}/bzrlib/tests/test_bzrdir.pyo
 ${PYSITELIB}/bzrlib/tests/test_command.py
 ${PYSITELIB}/bzrlib/tests/test_command.pyc
 ${PYSITELIB}/bzrlib/tests/test_command.pyo
@@ -243,9 +427,21 @@ ${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_decorators.py
+${PYSITELIB}/bzrlib/tests/test_decorators.pyc
+${PYSITELIB}/bzrlib/tests/test_decorators.pyo
 ${PYSITELIB}/bzrlib/tests/test_diff.py
 ${PYSITELIB}/bzrlib/tests/test_diff.pyc
 ${PYSITELIB}/bzrlib/tests/test_diff.pyo
+${PYSITELIB}/bzrlib/tests/test_doc_generate.py
+${PYSITELIB}/bzrlib/tests/test_doc_generate.pyc
+${PYSITELIB}/bzrlib/tests/test_doc_generate.pyo
+${PYSITELIB}/bzrlib/tests/test_errors.py
+${PYSITELIB}/bzrlib/tests/test_errors.pyc
+${PYSITELIB}/bzrlib/tests/test_errors.pyo
+${PYSITELIB}/bzrlib/tests/test_escaped_store.py
+${PYSITELIB}/bzrlib/tests/test_escaped_store.pyc
+${PYSITELIB}/bzrlib/tests/test_escaped_store.pyo
 ${PYSITELIB}/bzrlib/tests/test_fetch.py
 ${PYSITELIB}/bzrlib/tests/test_fetch.pyc
 ${PYSITELIB}/bzrlib/tests/test_fetch.pyo
@@ -267,6 +463,15 @@ ${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_knit.py
+${PYSITELIB}/bzrlib/tests/test_knit.pyc
+${PYSITELIB}/bzrlib/tests/test_knit.pyo
+${PYSITELIB}/bzrlib/tests/test_lockable_files.py
+${PYSITELIB}/bzrlib/tests/test_lockable_files.pyc
+${PYSITELIB}/bzrlib/tests/test_lockable_files.pyo
+${PYSITELIB}/bzrlib/tests/test_lockdir.py
+${PYSITELIB}/bzrlib/tests/test_lockdir.pyc
+${PYSITELIB}/bzrlib/tests/test_lockdir.pyo
 ${PYSITELIB}/bzrlib/tests/test_log.py
 ${PYSITELIB}/bzrlib/tests/test_log.pyc
 ${PYSITELIB}/bzrlib/tests/test_log.pyo
@@ -294,18 +499,24 @@ ${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_patch.py
+${PYSITELIB}/bzrlib/tests/test_patch.pyc
+${PYSITELIB}/bzrlib/tests/test_patch.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_progress.py
+${PYSITELIB}/bzrlib/tests/test_progress.pyc
+${PYSITELIB}/bzrlib/tests/test_progress.pyo
+${PYSITELIB}/bzrlib/tests/test_reconcile.py
+${PYSITELIB}/bzrlib/tests/test_reconcile.pyc
+${PYSITELIB}/bzrlib/tests/test_reconcile.pyo
+${PYSITELIB}/bzrlib/tests/test_repository.py
+${PYSITELIB}/bzrlib/tests/test_repository.pyc
+${PYSITELIB}/bzrlib/tests/test_repository.pyo
 ${PYSITELIB}/bzrlib/tests/test_revision.py
 ${PYSITELIB}/bzrlib/tests/test_revision.pyc
 ${PYSITELIB}/bzrlib/tests/test_revision.pyo
@@ -315,9 +526,6 @@ ${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
@@ -339,9 +547,6 @@ ${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
@@ -351,27 +556,42 @@ ${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_textfile.py
+${PYSITELIB}/bzrlib/tests/test_textfile.pyc
+${PYSITELIB}/bzrlib/tests/test_textfile.pyo
+${PYSITELIB}/bzrlib/tests/test_textmerge.py
+${PYSITELIB}/bzrlib/tests/test_textmerge.pyc
+${PYSITELIB}/bzrlib/tests/test_textmerge.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_transform.py
+${PYSITELIB}/bzrlib/tests/test_transform.pyc
+${PYSITELIB}/bzrlib/tests/test_transform.pyo
 ${PYSITELIB}/bzrlib/tests/test_transport.py
 ${PYSITELIB}/bzrlib/tests/test_transport.pyc
 ${PYSITELIB}/bzrlib/tests/test_transport.pyo
+${PYSITELIB}/bzrlib/tests/test_transport_implementations.py
+${PYSITELIB}/bzrlib/tests/test_transport_implementations.pyc
+${PYSITELIB}/bzrlib/tests/test_transport_implementations.pyo
 ${PYSITELIB}/bzrlib/tests/test_tsort.py
 ${PYSITELIB}/bzrlib/tests/test_tsort.pyc
 ${PYSITELIB}/bzrlib/tests/test_tsort.pyo
+${PYSITELIB}/bzrlib/tests/test_tuned_gzip.py
+${PYSITELIB}/bzrlib/tests/test_tuned_gzip.pyc
+${PYSITELIB}/bzrlib/tests/test_tuned_gzip.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_versionedfile.py
+${PYSITELIB}/bzrlib/tests/test_versionedfile.pyc
+${PYSITELIB}/bzrlib/tests/test_versionedfile.pyo
 ${PYSITELIB}/bzrlib/tests/test_weave.py
 ${PYSITELIB}/bzrlib/tests/test_weave.pyc
 ${PYSITELIB}/bzrlib/tests/test_weave.pyo
@@ -387,9 +607,33 @@ ${PYSITELIB}/bzrlib/tests/test_xml.pyo
 ${PYSITELIB}/bzrlib/tests/treeshape.py
 ${PYSITELIB}/bzrlib/tests/treeshape.pyc
 ${PYSITELIB}/bzrlib/tests/treeshape.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/__init__.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/__init__.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/__init__.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_basis_inventory.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_basis_inventory.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_break_lock.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_break_lock.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_break_lock.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_control_filename.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_is_control_filename.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_pull.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_pull.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_pull.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_workingtree.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_workingtree.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_workingtree.pyo
+${PYSITELIB}/bzrlib/textfile.py
+${PYSITELIB}/bzrlib/textfile.pyc
+${PYSITELIB}/bzrlib/textfile.pyo
 ${PYSITELIB}/bzrlib/textinv.py
 ${PYSITELIB}/bzrlib/textinv.pyc
 ${PYSITELIB}/bzrlib/textinv.pyo
+${PYSITELIB}/bzrlib/textmerge.py
+${PYSITELIB}/bzrlib/textmerge.pyc
+${PYSITELIB}/bzrlib/textmerge.pyo
 ${PYSITELIB}/bzrlib/textui.py
 ${PYSITELIB}/bzrlib/textui.pyc
 ${PYSITELIB}/bzrlib/textui.pyo
@@ -399,21 +643,42 @@ ${PYSITELIB}/bzrlib/trace.pyo
 ${PYSITELIB}/bzrlib/transactions.py
 ${PYSITELIB}/bzrlib/transactions.pyc
 ${PYSITELIB}/bzrlib/transactions.pyo
+${PYSITELIB}/bzrlib/transform.py
+${PYSITELIB}/bzrlib/transform.pyc
+${PYSITELIB}/bzrlib/transform.pyo
 ${PYSITELIB}/bzrlib/transport/__init__.py
 ${PYSITELIB}/bzrlib/transport/__init__.pyc
 ${PYSITELIB}/bzrlib/transport/__init__.pyo
+${PYSITELIB}/bzrlib/transport/decorator.py
+${PYSITELIB}/bzrlib/transport/decorator.pyc
+${PYSITELIB}/bzrlib/transport/decorator.pyo
+${PYSITELIB}/bzrlib/transport/fakenfs.py
+${PYSITELIB}/bzrlib/transport/fakenfs.pyc
+${PYSITELIB}/bzrlib/transport/fakenfs.pyo
+${PYSITELIB}/bzrlib/transport/fakevfat.py
+${PYSITELIB}/bzrlib/transport/fakevfat.pyc
+${PYSITELIB}/bzrlib/transport/fakevfat.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
+${PYSITELIB}/bzrlib/transport/http/__init__.py
+${PYSITELIB}/bzrlib/transport/http/__init__.pyc
+${PYSITELIB}/bzrlib/transport/http/__init__.pyo
+${PYSITELIB}/bzrlib/transport/http/_pycurl.py
+${PYSITELIB}/bzrlib/transport/http/_pycurl.pyc
+${PYSITELIB}/bzrlib/transport/http/_pycurl.pyo
+${PYSITELIB}/bzrlib/transport/http/_urllib.py
+${PYSITELIB}/bzrlib/transport/http/_urllib.pyc
+${PYSITELIB}/bzrlib/transport/http/_urllib.pyo
 ${PYSITELIB}/bzrlib/transport/local.py
 ${PYSITELIB}/bzrlib/transport/local.pyc
 ${PYSITELIB}/bzrlib/transport/local.pyo
 ${PYSITELIB}/bzrlib/transport/memory.py
 ${PYSITELIB}/bzrlib/transport/memory.pyc
 ${PYSITELIB}/bzrlib/transport/memory.pyo
+${PYSITELIB}/bzrlib/transport/readonly.py
+${PYSITELIB}/bzrlib/transport/readonly.pyc
+${PYSITELIB}/bzrlib/transport/readonly.pyo
 ${PYSITELIB}/bzrlib/transport/sftp.py
 ${PYSITELIB}/bzrlib/transport/sftp.pyc
 ${PYSITELIB}/bzrlib/transport/sftp.pyo
@@ -423,6 +688,9 @@ ${PYSITELIB}/bzrlib/tree.pyo
 ${PYSITELIB}/bzrlib/tsort.py
 ${PYSITELIB}/bzrlib/tsort.pyc
 ${PYSITELIB}/bzrlib/tsort.pyo
+${PYSITELIB}/bzrlib/tuned_gzip.py
+${PYSITELIB}/bzrlib/tuned_gzip.pyc
+${PYSITELIB}/bzrlib/tuned_gzip.pyo
 ${PYSITELIB}/bzrlib/ui/__init__.py
 ${PYSITELIB}/bzrlib/ui/__init__.pyc
 ${PYSITELIB}/bzrlib/ui/__init__.pyo
@@ -465,9 +733,15 @@ ${PYSITELIB}/bzrlib/util/elementtree/ElementTree.pyo
 ${PYSITELIB}/bzrlib/util/elementtree/__init__.py
 ${PYSITELIB}/bzrlib/util/elementtree/__init__.pyc
 ${PYSITELIB}/bzrlib/util/elementtree/__init__.pyo
+${PYSITELIB}/bzrlib/versionedfile.py
+${PYSITELIB}/bzrlib/versionedfile.pyc
+${PYSITELIB}/bzrlib/versionedfile.pyo
 ${PYSITELIB}/bzrlib/weave.py
 ${PYSITELIB}/bzrlib/weave.pyc
 ${PYSITELIB}/bzrlib/weave.pyo
+${PYSITELIB}/bzrlib/weave_commands.py
+${PYSITELIB}/bzrlib/weave_commands.pyc
+${PYSITELIB}/bzrlib/weave_commands.pyo
 ${PYSITELIB}/bzrlib/weavefile.py
 ${PYSITELIB}/bzrlib/weavefile.pyc
 ${PYSITELIB}/bzrlib/weavefile.pyo
@@ -477,84 +751,22 @@ ${PYSITELIB}/bzrlib/win32console.pyo
 ${PYSITELIB}/bzrlib/workingtree.py
 ${PYSITELIB}/bzrlib/workingtree.pyc
 ${PYSITELIB}/bzrlib/workingtree.pyo
-${PYSITELIB}/bzrlib/xml.py
-${PYSITELIB}/bzrlib/xml.pyc
-${PYSITELIB}/bzrlib/xml.pyo
 ${PYSITELIB}/bzrlib/xml4.py
 ${PYSITELIB}/bzrlib/xml4.pyc
 ${PYSITELIB}/bzrlib/xml4.pyo
 ${PYSITELIB}/bzrlib/xml5.py
 ${PYSITELIB}/bzrlib/xml5.pyc
 ${PYSITELIB}/bzrlib/xml5.pyo
+${PYSITELIB}/bzrlib/xml_serializer.py
+${PYSITELIB}/bzrlib/xml_serializer.pyc
+${PYSITELIB}/bzrlib/xml_serializer.pyo
 man/man1/bzr.1
-share/doc/bzr/adoption.txt
-share/doc/bzr/bitkeeper.txt
-share/doc/bzr/changelogs.txt
-share/doc/bzr/cherry-picking.txt
-share/doc/bzr/cmdref.txt
-share/doc/bzr/common-format.txt
-share/doc/bzr/compared-aegis.txt
-share/doc/bzr/compared-codeville.txt
-share/doc/bzr/compared-cvsnt.txt
-share/doc/bzr/compared-opencm.txt
-share/doc/bzr/compared-prcs.txt
-share/doc/bzr/compared-teamware.txt
-share/doc/bzr/compression.txt
-share/doc/bzr/config-specs.txt
-share/doc/bzr/conflicts.txt
-share/doc/bzr/costs.txt
-share/doc/bzr/darcs.txt
-share/doc/bzr/deadly-sins.txt
-share/doc/bzr/design.txt
-share/doc/bzr/extra-commands.txt
-share/doc/bzr/formats.txt
-share/doc/bzr/hashes.txt
-share/doc/bzr/ignore.txt
-share/doc/bzr/index.txt
-share/doc/bzr/interrupted.txt
-share/doc/bzr/intro.txt
-share/doc/bzr/inventory.txt
-share/doc/bzr/join-branches.txt
-share/doc/bzr/kill-version.txt
-share/doc/bzr/layers.txt
-share/doc/bzr/library-interface.txt
-share/doc/bzr/merge.txt
-share/doc/bzr/mirroring.txt
-share/doc/bzr/monotone.txt
-share/doc/bzr/news.txt
-share/doc/bzr/optional-edit.txt
-share/doc/bzr/partial-commit.txt
-share/doc/bzr/pool.txt
-share/doc/bzr/purpose.txt
-share/doc/bzr/python.txt
-share/doc/bzr/quilt.txt
-share/doc/bzr/quotes.txt
-share/doc/bzr/random.txt
-share/doc/bzr/requirements.txt
-share/doc/bzr/revfile-annotation.txt
-share/doc/bzr/revfile.txt
-share/doc/bzr/revision-syntax.txt
-share/doc/bzr/rollup.txt
-share/doc/bzr/scalability.txt
-share/doc/bzr/security.txt
-share/doc/bzr/shared-branches.txt
-share/doc/bzr/short-demo.txt
-share/doc/bzr/split-join-files.txt
-share/doc/bzr/supportability.txt
-share/doc/bzr/svk.txt
-share/doc/bzr/switch-in-branch.txt
-share/doc/bzr/tagging.txt
-share/doc/bzr/taxonomy.txt
-share/doc/bzr/thanks.txt
-share/doc/bzr/todo-from-arch.txt
+share/doc/bzr/configuration.txt
+share/doc/bzr/plugins.txt
+share/doc/bzr/setting_up_email.txt
+share/doc/bzr/specifying_revisions.txt
 share/doc/bzr/tutorial.txt
-share/doc/bzr/unchanged.txt
-share/doc/bzr/unrelated-merge.txt
-share/doc/bzr/usability.txt
-share/doc/bzr/use-cases.txt
-share/doc/bzr/web-interface.txt
-share/doc/bzr/workflow.txt
-share/doc/bzr/yaml.txt
+share/doc/bzr/using_aliases.txt
 @dirrm share/doc/bzr
 @dirrm ${PYSITELIB}/bzrlib/util/elementtree
 @dirrm ${PYSITELIB}/bzrlib/util/effbot/org
@@ -562,10 +774,23 @@ share/doc/bzr/yaml.txt
 @dirrm ${PYSITELIB}/bzrlib/util/configobj
 @dirrm ${PYSITELIB}/bzrlib/util
 @dirrm ${PYSITELIB}/bzrlib/ui
+@dirrm ${PYSITELIB}/bzrlib/transport/http
 @dirrm ${PYSITELIB}/bzrlib/transport
+@dirrm ${PYSITELIB}/bzrlib/tests/workingtree_implementations
+@dirrm ${PYSITELIB}/bzrlib/tests/revisionstore_implementations
+@dirrm ${PYSITELIB}/bzrlib/tests/repository_implementations
+@dirrm ${PYSITELIB}/bzrlib/tests/interversionedfile_implementations
+@dirrm ${PYSITELIB}/bzrlib/tests/interrepository_implementations
+@dirrm ${PYSITELIB}/bzrlib/tests/bzrdir_implementations
+@dirrm ${PYSITELIB}/bzrlib/tests/branch_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/blackbox
 @dirrm ${PYSITELIB}/bzrlib/tests
+@dirrm ${PYSITELIB}/bzrlib/store/versioned
+@dirrm ${PYSITELIB}/bzrlib/store/revision
 @dirrm ${PYSITELIB}/bzrlib/store
+@dirrm ${PYSITELIB}/bzrlib/plugins/launchpad
 @dirrm ${PYSITELIB}/bzrlib/plugins
 @dirrm ${PYSITELIB}/bzrlib/export
+@dirrm ${PYSITELIB}/bzrlib/doc/api
+@dirrm ${PYSITELIB}/bzrlib/doc
 @dirrm ${PYSITELIB}/bzrlib
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index e96c698b0b7..c6740e30d50 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2006/01/25 20:17:57 wiz Exp $
+$NetBSD: distinfo,v 1.3 2006/07/12 14:30:55 wiz Exp $
 
-SHA1 (bzr-0.7.tar.gz) = 941a0800e967aa389776800dfa2f58b03b9e0750
-RMD160 (bzr-0.7.tar.gz) = e207ed79ffd9e88e5f7ab4b618bd584f4734fff4
-Size (bzr-0.7.tar.gz) = 569679 bytes
+SHA1 (bzr-0.8.2.tar.gz) = 1aea6e0783219f0c2d074c9407ad09cb36b4ade2
+RMD160 (bzr-0.8.2.tar.gz) = 5cdbfa3f9a87fc1b999e1bef187f1e83fc7cb251
+Size (bzr-0.8.2.tar.gz) = 720152 bytes