update to bzr 0.15

bzr 0.15 2007-04-01

  BUGFIXES:

    * Handle incompatible repositories as a user issue when fetching.
      (Aaron Bentley)

    * Don't give a recommendation to upgrade when branching or
      checking out a branch that contains an old-format working tree.
      (Martin Pool)

bzr 0.15rc3  2007-03-26

  CHANGES:

    * A warning is now displayed when opening working trees in older
      formats, to encourage people to upgrade to WorkingTreeFormat4.
      (Martin Pool)

  IMPROVEMENTS:

    * HTTP redirections are now taken into account when a branch (or a
      bundle) is accessed for the first time. A message is issued at each
      redirection to inform the user. In the past, http redirections were
      silently followed for each request which significantly degraded the
      performances. The http redirections are not followed anymore by
      default, instead a RedirectRequested exception is raised. For bzrlib
      users needing to follow http redirections anyway,
      bzrlib.transport.do_catching_redirections provide an easy transition
      path.  (vila)

  INTERNALS:

    * Added ``ReadLock.temporary_write_lock()`` to allow upgrading an OS read
      lock to an OS write lock. Linux can do this without unlocking, Win32
      needs to unlock in between. (John Arbash Meinel)

    * New parameter ``recommend_upgrade`` to BzrDir.open_workingtree
      to silence (when false) warnings about opening old formats.
      (Martin Pool)

    * Fix minor performance regression with bzr-0.15 on pre-dirstate
      trees. (We were reading the working inventory too many times).
      (John Arbash Meinel)

  BUGFIXES:

    * Take smtp_server from user config into account.
      (vila, #92195)

    * Restore Unicode filename handling for versioned and unversioned files.
      (John Arbash Meinel, #92608)

    * Don't fail during ``bzr commit`` if a file is marked removed, and
      the containing directory is auto-removed.  (John Arbash Meinel, #93681)

    * ``bzr status FILENAME`` failed on Windows because of an uncommon
      errno. (``ERROR_DIRECTORY == 267 != ENOTDIR``).
      (Wouter van Heyst, John Arbash Meinel, #90819)

    * ``bzr checkout source`` should create a local branch in the same
      format as source. (John Arbash Meinel, #93854)

    * ``bzr commit`` with a kind change was failing to update the
      last-changed-revision for directories.  The
      InventoryDirectory._unchanged only looked at the parent_id and name,
      ignoring the fact that the kind could have changed, too.
      (John Arbash Meinel, #90111)

    * ``bzr mv dir/subdir other`` was incorrectly updating files inside
      the directory. So that there was a chance it would break commit,
      etc. (John Arbash Meinel, #94037)

    * Correctly handles mutiple permanent http redirections.
     (vila, #88780)


bzr 0.15rc2  2007-03-14

  NOTES WHEN UPGRADING:

    * Release 0.15rc2 of bzr changes the ``bzr init-repo`` command to
      default to ``--trees`` instead of ``--no-trees``.
      Existing shared repositories are not affected.

  IMPROVEMENTS:

    * New ``merge-directive`` command to generate machine- and human-readable
      merge requests.  (Aaron Bentley)

    * New ``submit:`` revision specifier makes it easy to diff against the
      common ancestor with the submit location (Aaron Bentley)

    * Added support for Putty's SSH implementation. (Dmitry Vasiliev)

    * Added ``bzr status --versioned`` to report only versioned files,
      not unknowns. (Kent Gibson)

    * Merge now autodetects the correct line-ending style for its conflict
      markers.  (Aaron Bentley)

  INTERNALS:

    * Refactored SSH vendor registration into SSHVendorManager class.
      (Dmitry Vasiliev)

  BUGFIXES:

    * New ``--numbered-dirs`` option to ``bzr selftest`` to use
      numbered dirs for TestCaseInTempDir. This is default behavior
      on Windows. Anyone can force named dirs on Windows
      with ``--no-numbered-dirs``. (Alexander Belchenko)

    * Fix ``RevisionSpec_revid`` to handle the Unicode strings passed in
      from the command line. (Marien Zwart, #90501)

    * Fix ``TreeTransform._iter_changes`` when both the source and
      destination are missing. (Aaron Bentley, #88842)

    * Fix commit of merges with symlinks in dirstate trees.
      (Marien Zwart)

    * Switch the ``bzr init-repo`` default from --no-trees to --trees.
      (Wouter van Heyst, #53483)


bzr 0.15rc1  2007-03-07

  SURPRISES:

    * The default disk format has changed. Please run 'bzr upgrade' in your
      working trees to upgrade. This new default is compatible for network
      operations, but not for local operations. That is, if you have two
      versions of bzr installed locally, after upgrading you can only use the
      bzr 0.15 version. This new default does not enable tags or nested-trees
      as they are incompatible with bzr versions before 0.15 over the network.

    * For users of bzrlib: Two major changes have been made to the working tree
      api in bzrlib. The first is that many methods and attributes, including
      the inventory attribute, are no longer valid for use until one of
      lock_read/lock_write/lock_tree_write has been called, and become invalid
      again after unlock is called. This has been done to improve performance
      and correctness as part of the dirstate development. (Robert Collins,
      John A Meinel, Martin Pool, and others).

    * For users of bzrlib: The attribute 'tree.inventory' should be considered
      readonly. Previously it was possible to directly alter this attribute, or
      its contents, and have the tree notice this. This has been made
      unsupported - it may work in some tree formats, but in the newer dirstate
      format such actions will have no effect and will be ignored, or even
      cause assertions. All operations possible can still be carried out by a
      combination of the tree API, and the bzrlib.transform API. (Robert
      Collins, John A Meinel, Martin Pool, and others).

  IMPROVEMENTS:

    * Support for OS Windows 98. Also .bzr.log on any windows system
      saved in My Documents folder. (Alexander Belchenko)

    * ``bzr mv`` enhanced to support already moved files.
      In the past the mv command would have failed if the source file doesn't
      exist. In this situation ``bzr mv`` would now detect that the file has
      already moved and update the repository accordingly, if the target file
      does exist.
      A new option ``--after`` has been added so that if two files already
      exist, you could notify Bazaar that you have moved a (versioned) file
      and replaced it with another. Thus in this case ``bzr move --after``
      will only update the Bazaar identifier.
      (Steffen Eichenberg, Marius Kruger)

    * ``ls`` now works on treeless branches and remote branches.
      (Aaron Bentley)

    * ``bzr help global-options`` describes the global options.
      (Aaron Bentley)

    * ``bzr pull --overwrite`` will now correctly overwrite checkouts.
      (Robert Collins)

    * Files are now allowed to change kind (e.g. from file to symlink).
      Supported by ``commit``, ``revert`` and ``status``
      (Aaron Bentley)

    * ``inventory`` and ``unknowns`` hidden in favour of ``ls``
      (Aaron Bentley)

    * ``bzr help checkouts`` descibes what checkouts are and some possible
      uses of them. (James Westby, Aaron Bentley)

    * A new ``-d`` option to push, pull and merge overrides the default
      directory.  (Martin Pool)

    * Branch format 6: smaller, and potentially faster than format 5.  Supports
      "append_history_only" mode, where the log view and revnos do not change,
      except by being added to.  Stores policy settings in
      ".bzr/branch/branch.conf".

    * append_only branches:  Format 6 branches may be configured so that log
      view and revnos are always consistent.  Either create the branch using
      "bzr init --append-revisions-only" or edit the config file as descriped
      in docs/configuration.txt.

    * rebind: Format 6 branches retain the last-used bind location, so if you
      "bzr unbind", you can "bzr bind" to bind to the previously-selected
      bind location.

    * Builtin tags support, created and deleted by the ``tag`` command and
      stored in the branch.  Tags can be accessed with the revisionspec
      ``-rtag:``, and listed with ``bzr tags``.  Tags are not versioned
      at present. Tags require a network incompatible upgrade. To perform this
      upgrade, run ``bzr upgrade --dirstate-tags`` in your branch and
      repositories. (Martin Pool)

    * The bzr:// transport now has a well-known port number, 4155, which it will
      use by default.  (Andrew Bennetts, Martin Pool)

    * Bazaar now looks for user-installed plugins before looking for site-wide
      plugins. (Jonathan Lange)

    * ``bzr resolve`` now detects and marks resolved text conflicts.
      (Aaron Bentley)

  INTERNALS:

    * Internally revision ids and file ids are now passed around as utf-8
      bytestrings, rather than treating them as Unicode strings. This has
      performance benefits for Knits, since we no longer need to decode the
      revision id for each line of content, nor for each entry in the index.
      This will also help with the future dirstate format.
      (John Arbash Meinel)

    * Reserved ids (any revision-id ending in a colon) are rejected by
      versionedfiles, repositories, branches, and working trees
      (Aaron Bentley)

    * Minor performance improvement by not creating a ProgressBar for
      every KnitIndex we create. (about 90ms for a bzr.dev tree)
      (John Arbash Meinel)

    * New easier to use Branch hooks facility. There are five initial hooks,
      all documented in bzrlib.branch.BranchHooks.__init__ - 'set_rh',
      'post_push', 'post_pull', 'post_commit', 'post_uncommit'. These hooks
      fire after the matching operation on a branch has taken place, and were
      originally added for the branchrss plugin. (Robert Collins)

    * New method ``Branch.push()`` which should be used when pushing from a
      branch as it makes performance and policy decisions to match the UI
      level command ``push``. (Robert Collins).

    * Add a new method ``Tree.revision_tree`` which allows access to cached
      trees for arbitrary revisions. This allows the in development dirstate
      tree format to provide access to the callers to cached copies of
      inventory data which are cheaper to access than inventories from the
      repository.
      (Robert Collins, Martin Pool)

    * New Branch.last_revision_info method, this is being done to allow
      optimization of requests for both the number of revisions and the last
      revision of a branch with smartservers and potentially future branch
      formats. (Wouter van Heyst, Robert Collins)

    * Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not
      yet been loaded by load_plugins(). This allows plugins to depend on each
      other for code reuse without requiring users to perform file-renaming
      gymnastics. (Robert Collins)

    * New Repository method 'gather_stats' for statistic data collection.
      This is expected to grow to cover a number of related uses mainly
      related to bzr info. (Robert Collins)

    * Log formatters are now managed with a registry.
      ``log.register_formatter`` continues to work, but callers accessing
      the FORMATTERS dictionary directly will not.

    * Allow a start message to be passed to the ``edit_commit_message``
      function.  This will be placed in the message offered to the user
      for editing above the separator. It allows a template commit message
      to be used more easily. (James Westby)

    * ``GPGStrategy.sign()`` will now raise ``BzrBadParameterUnicode`` if
      you pass a Unicode string rather than an 8-bit string. Callers need
      to be updated to encode first. (John Arbash Meinel)

    * Branch.push, pull, merge now return Result objects with information
      about what happened, rather than a scattering of various methods.  These
      are also passed to the post hooks.  (Martin Pool)

    * File formats and architecture is in place for managing a forest of trees
      in bzr, and splitting up existing trees into smaller subtrees, and
      finally joining trees to make a larger tree. This is the first iteration
      of this support, and the user-facing aspects still require substantial
      work.  If you wish to experiment with it, use ``bzr upgrade
      --dirstate-with-subtree`` in your working trees and repositories.
      You can use the hidden commands ``split`` and ``join`` and to create
      and manipulate nested trees, but please consider using the nested-trees
      branch, which contains substantial UI improvements, instead.
      http://code.aaronbentley.com/bzr/bzrrepo/nested-trees/
      (Aaron Bentley, Martin Pool, Robert Collins).

  BUGFIXES:

    * ``bzr annotate`` now uses dotted revnos from the viewpoint of the
      branch, rather than the last changed revision of the file.
      (John Arbash Meinel, #82158)

    * Lock operations no longer hang if they encounter a permission problem.
      (Aaron Bentley)

    * ``bzr push`` can resume a push that was canceled before it finished.
      Also, it can push even if the target directory exists if you supply
      the ``--use-existing-dir`` flag.
      (John Arbash Meinel, #30576, #45504)

    * Fix http proxy authentication when user and an optional
      password appears in the ``*_proxy`` vars. (Vincent Ladeuil,
      #83954).

    * ``bzr log branch/file`` works for local treeless branches
      (Aaron Bentley, #84247)

    * Fix problem with UNC paths on Windows 98. (Alexander Belchenko, #84728)

    * Searching location of CA bundle for PyCurl in env variable (CURL_CA_BUNDLE),
      and on win32 along the PATH. (Alexander Belchenko, #82086)

    * ``bzr init`` works with unicode argument LOCATION.
      (Alexander Belchenko, #85599)

    * Raise DependencyNotPresent if pycurl do not support https. (Vincent
      Ladeuil, #85305)

    * Invalid proxy env variables should not cause a traceback.
      (Vincent Ladeuil, #87765)

    * Ignore patterns normalised to use '/' path separator.
      (Kent Gibson, #86451)

    * bzr rocks. It sure does! Fix case. (Vincent Ladeuil, #78026)

    * Fix bzrtools shelve command for removed lines beginning with "--"
      (Johan Dahlberg, #75577)

  TESTING:

    * New ``--first`` option to ``bzr selftest`` to run specified tests
      before the rest of the suite.  (Martin Pool)

4 files changed, 188 insertions, 15 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index ff19daa5ddd..950fb6c3d25 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2007/03/22 20:25:09 recht Exp $
+# $NetBSD: Makefile,v 1.13 2007/04/08 11:36:22 recht Exp $
 #
 
-DISTNAME=		bzr-0.14
+DISTNAME=		bzr-0.15
 CATEGORIES=		devel scm
 MASTER_SITES=		http://bazaar-vcs.org/releases/src/
 
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index 436feaba5c2..7399fe1e294 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2007/03/22 20:25:09 recht Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/04/08 11:36:22 recht Exp $
 bin/bzr
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
@@ -147,6 +147,9 @@ ${PYSITELIB}/bzrlib/delta.pyo
 ${PYSITELIB}/bzrlib/diff.py
 ${PYSITELIB}/bzrlib/diff.pyc
 ${PYSITELIB}/bzrlib/diff.pyo
+${PYSITELIB}/bzrlib/dirstate.py
+${PYSITELIB}/bzrlib/dirstate.pyc
+${PYSITELIB}/bzrlib/dirstate.pyo
 ${PYSITELIB}/bzrlib/doc/__init__.py
 ${PYSITELIB}/bzrlib/doc/__init__.pyc
 ${PYSITELIB}/bzrlib/doc/__init__.pyo
@@ -254,6 +257,9 @@ ${PYSITELIB}/bzrlib/merge.pyo
 ${PYSITELIB}/bzrlib/merge3.py
 ${PYSITELIB}/bzrlib/merge3.pyc
 ${PYSITELIB}/bzrlib/merge3.pyo
+${PYSITELIB}/bzrlib/merge_directive.py
+${PYSITELIB}/bzrlib/merge_directive.pyc
+${PYSITELIB}/bzrlib/merge_directive.pyo
 ${PYSITELIB}/bzrlib/missing.py
 ${PYSITELIB}/bzrlib/missing.pyc
 ${PYSITELIB}/bzrlib/missing.pyo
@@ -287,9 +293,15 @@ ${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_indirect.py
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_indirect.pyc
+${PYSITELIB}/bzrlib/plugins/launchpad/lp_indirect.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_lp_indirect.py
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_indirect.pyc
+${PYSITELIB}/bzrlib/plugins/launchpad/test_lp_indirect.pyo
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_register.py
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_register.pyc
 ${PYSITELIB}/bzrlib/plugins/launchpad/test_register.pyo
@@ -302,6 +314,15 @@ ${PYSITELIB}/bzrlib/reconcile.pyo
 ${PYSITELIB}/bzrlib/registry.py
 ${PYSITELIB}/bzrlib/registry.pyc
 ${PYSITELIB}/bzrlib/registry.pyo
+${PYSITELIB}/bzrlib/repofmt/__init__.py
+${PYSITELIB}/bzrlib/repofmt/__init__.pyc
+${PYSITELIB}/bzrlib/repofmt/__init__.pyo
+${PYSITELIB}/bzrlib/repofmt/knitrepo.py
+${PYSITELIB}/bzrlib/repofmt/knitrepo.pyc
+${PYSITELIB}/bzrlib/repofmt/knitrepo.pyo
+${PYSITELIB}/bzrlib/repofmt/weaverepo.py
+${PYSITELIB}/bzrlib/repofmt/weaverepo.pyc
+${PYSITELIB}/bzrlib/repofmt/weaverepo.pyo
 ${PYSITELIB}/bzrlib/repository.py
 ${PYSITELIB}/bzrlib/repository.pyc
 ${PYSITELIB}/bzrlib/repository.pyo
@@ -347,6 +368,9 @@ ${PYSITELIB}/bzrlib/store/versioned/__init__.pyo
 ${PYSITELIB}/bzrlib/symbol_versioning.py
 ${PYSITELIB}/bzrlib/symbol_versioning.pyc
 ${PYSITELIB}/bzrlib/symbol_versioning.pyo
+${PYSITELIB}/bzrlib/tag.py
+${PYSITELIB}/bzrlib/tag.pyc
+${PYSITELIB}/bzrlib/tag.pyo
 ${PYSITELIB}/bzrlib/testament.py
 ${PYSITELIB}/bzrlib/testament.pyc
 ${PYSITELIB}/bzrlib/testament.pyo
@@ -443,6 +467,9 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_init.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_inventory.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_inventory.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_inventory.pyo
+${PYSITELIB}/bzrlib/tests/blackbox/test_join.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_join.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_join.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_locale.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_locale.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_locale.pyo
@@ -458,6 +485,9 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_ls.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_merge_directive.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_merge_directive.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_merge_directive.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_missing.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_missing.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_missing.pyo
@@ -518,9 +548,15 @@ ${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_split.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_split.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_split.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_tags.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_tags.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_tags.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_testament.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_testament.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_testament.pyo
@@ -536,6 +572,9 @@ ${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_version.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_version.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_version.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_version_info.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_version_info.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_version_info.pyo
@@ -557,9 +596,21 @@ ${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_commit.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_commit.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_commit.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_create_checkout.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_create_checkout.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_create_checkout.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_hooks.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_hooks.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_hooks.pyo
 ${PYSITELIB}/bzrlib/tests/branch_implementations/test_http.py
 ${PYSITELIB}/bzrlib/tests/branch_implementations/test_http.pyc
 ${PYSITELIB}/bzrlib/tests/branch_implementations/test_http.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_last_revision_info.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_last_revision_info.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_last_revision_info.pyo
 ${PYSITELIB}/bzrlib/tests/branch_implementations/test_locking.py
 ${PYSITELIB}/bzrlib/tests/branch_implementations/test_locking.pyc
 ${PYSITELIB}/bzrlib/tests/branch_implementations/test_locking.pyo
@@ -572,6 +623,15 @@ ${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_push.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_push.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_push.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_tags.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_tags.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_tags.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_uncommit.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_uncommit.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_uncommit.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
@@ -602,6 +662,15 @@ ${PYSITELIB}/bzrlib/tests/interversionedfile_implementations/test_join.pyo
 ${PYSITELIB}/bzrlib/tests/lock_helpers.py
 ${PYSITELIB}/bzrlib/tests/lock_helpers.pyc
 ${PYSITELIB}/bzrlib/tests/lock_helpers.pyo
+${PYSITELIB}/bzrlib/tests/per_lock/__init__.py
+${PYSITELIB}/bzrlib/tests/per_lock/__init__.pyc
+${PYSITELIB}/bzrlib/tests/per_lock/__init__.pyo
+${PYSITELIB}/bzrlib/tests/per_lock/test_lock.py
+${PYSITELIB}/bzrlib/tests/per_lock/test_lock.pyc
+${PYSITELIB}/bzrlib/tests/per_lock/test_lock.pyo
+${PYSITELIB}/bzrlib/tests/per_lock/test_temporary_write_lock.py
+${PYSITELIB}/bzrlib/tests/per_lock/test_temporary_write_lock.pyc
+${PYSITELIB}/bzrlib/tests/per_lock/test_temporary_write_lock.pyo
 ${PYSITELIB}/bzrlib/tests/repository_implementations/__init__.py
 ${PYSITELIB}/bzrlib/tests/repository_implementations/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/repository_implementations/__init__.pyo
@@ -614,6 +683,9 @@ ${PYSITELIB}/bzrlib/tests/repository_implementations/test_commit_builder.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_iter_reverse_revision_history.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.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
@@ -623,6 +695,9 @@ ${PYSITELIB}/bzrlib/tests/repository_implementations/test_repository.pyo
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_revision.py
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_revision.pyc
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_revision.pyo
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_statistics.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_statistics.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_statistics.pyo
 ${PYSITELIB}/bzrlib/tests/revisionstore_implementations/__init__.py
 ${PYSITELIB}/bzrlib/tests/revisionstore_implementations/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/revisionstore_implementations/__init__.pyo
@@ -677,9 +752,15 @@ ${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_delta.py
+${PYSITELIB}/bzrlib/tests/test_delta.pyc
+${PYSITELIB}/bzrlib/tests/test_delta.pyo
 ${PYSITELIB}/bzrlib/tests/test_diff.py
 ${PYSITELIB}/bzrlib/tests/test_diff.pyc
 ${PYSITELIB}/bzrlib/tests/test_diff.pyo
+${PYSITELIB}/bzrlib/tests/test_dirstate.py
+${PYSITELIB}/bzrlib/tests/test_dirstate.pyc
+${PYSITELIB}/bzrlib/tests/test_dirstate.pyo
 ${PYSITELIB}/bzrlib/tests/test_doc_generate.py
 ${PYSITELIB}/bzrlib/tests/test_doc_generate.pyc
 ${PYSITELIB}/bzrlib/tests/test_doc_generate.pyo
@@ -689,6 +770,9 @@ ${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_extract.py
+${PYSITELIB}/bzrlib/tests/test_extract.pyc
+${PYSITELIB}/bzrlib/tests/test_extract.pyo
 ${PYSITELIB}/bzrlib/tests/test_fetch.py
 ${PYSITELIB}/bzrlib/tests/test_fetch.pyc
 ${PYSITELIB}/bzrlib/tests/test_fetch.pyo
@@ -719,6 +803,9 @@ ${PYSITELIB}/bzrlib/tests/test_http.pyo
 ${PYSITELIB}/bzrlib/tests/test_http_response.py
 ${PYSITELIB}/bzrlib/tests/test_http_response.pyc
 ${PYSITELIB}/bzrlib/tests/test_http_response.pyo
+${PYSITELIB}/bzrlib/tests/test_https_ca_bundle.py
+${PYSITELIB}/bzrlib/tests/test_https_ca_bundle.pyc
+${PYSITELIB}/bzrlib/tests/test_https_ca_bundle.pyo
 ${PYSITELIB}/bzrlib/tests/test_identitymap.py
 ${PYSITELIB}/bzrlib/tests/test_identitymap.pyc
 ${PYSITELIB}/bzrlib/tests/test_identitymap.pyo
@@ -758,6 +845,9 @@ ${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_merge_directive.py
+${PYSITELIB}/bzrlib/tests/test_merge_directive.pyc
+${PYSITELIB}/bzrlib/tests/test_merge_directive.pyo
 ${PYSITELIB}/bzrlib/tests/test_missing.py
 ${PYSITELIB}/bzrlib/tests/test_missing.pyc
 ${PYSITELIB}/bzrlib/tests/test_missing.pyo
@@ -859,15 +949,24 @@ ${PYSITELIB}/bzrlib/tests/test_smart_transport.pyo
 ${PYSITELIB}/bzrlib/tests/test_source.py
 ${PYSITELIB}/bzrlib/tests/test_source.pyc
 ${PYSITELIB}/bzrlib/tests/test_source.pyo
+${PYSITELIB}/bzrlib/tests/test_ssh_transport.py
+${PYSITELIB}/bzrlib/tests/test_ssh_transport.pyc
+${PYSITELIB}/bzrlib/tests/test_ssh_transport.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_subsume.py
+${PYSITELIB}/bzrlib/tests/test_subsume.pyc
+${PYSITELIB}/bzrlib/tests/test_subsume.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_tag.py
+${PYSITELIB}/bzrlib/tests/test_tag.pyc
+${PYSITELIB}/bzrlib/tests/test_tag.pyo
 ${PYSITELIB}/bzrlib/tests/test_testament.py
 ${PYSITELIB}/bzrlib/tests/test_testament.pyc
 ${PYSITELIB}/bzrlib/tests/test_testament.pyo
@@ -877,6 +976,9 @@ ${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_timestamp.py
+${PYSITELIB}/bzrlib/tests/test_timestamp.pyc
+${PYSITELIB}/bzrlib/tests/test_timestamp.pyo
 ${PYSITELIB}/bzrlib/tests/test_trace.py
 ${PYSITELIB}/bzrlib/tests/test_trace.pyc
 ${PYSITELIB}/bzrlib/tests/test_trace.pyo
@@ -931,6 +1033,9 @@ ${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_workingtree_4.py
+${PYSITELIB}/bzrlib/tests/test_workingtree_4.pyc
+${PYSITELIB}/bzrlib/tests/test_workingtree_4.pyo
 ${PYSITELIB}/bzrlib/tests/test_wsgi.py
 ${PYSITELIB}/bzrlib/tests/test_wsgi.pyc
 ${PYSITELIB}/bzrlib/tests/test_wsgi.pyo
@@ -940,21 +1045,48 @@ ${PYSITELIB}/bzrlib/tests/test_xml.pyo
 ${PYSITELIB}/bzrlib/tests/tree_implementations/__init__.py
 ${PYSITELIB}/bzrlib/tests/tree_implementations/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/tree_implementations/__init__.pyo
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_file_mtime.py
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_file_mtime.pyc
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_file_mtime.pyo
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_symlink_target.py
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_symlink_target.pyc
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_symlink_target.pyo
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_inv.py
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_inv.pyc
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_inv.pyo
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_list_files.py
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_list_files.pyc
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_list_files.pyo
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_revision_tree.py
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_revision_tree.pyc
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_revision_tree.pyo
 ${PYSITELIB}/bzrlib/tests/tree_implementations/test_test_trees.py
 ${PYSITELIB}/bzrlib/tests/tree_implementations/test_test_trees.pyc
 ${PYSITELIB}/bzrlib/tests/tree_implementations/test_test_trees.pyo
 ${PYSITELIB}/bzrlib/tests/tree_implementations/test_tree.py
 ${PYSITELIB}/bzrlib/tests/tree_implementations/test_tree.pyc
 ${PYSITELIB}/bzrlib/tests/tree_implementations/test_tree.pyo
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_walkdirs.py
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_walkdirs.pyc
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_walkdirs.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_add.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_add.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_add.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_add_reference.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_add_reference.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_add_reference.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_basis_tree.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_basis_tree.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_basis_tree.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
@@ -973,6 +1105,9 @@ ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_flush.pyo
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyc
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_parent_ids.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_inv.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_inv.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_inv.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
@@ -988,9 +1123,18 @@ ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_merge_from_branch.pyo
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_mkdir.py
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_mkdir.pyc
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_mkdir.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_move.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_move.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_move.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_nested_specifics.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_nested_specifics.pyo
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_parents.py
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_parents.pyc
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_parents.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_paths2ids.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_paths2ids.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_paths2ids.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
@@ -1003,12 +1147,24 @@ ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_read_working_inventor
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_readonly.py
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_readonly.pyc
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_readonly.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_rename_one.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_rename_one.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_rename_one.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_revision_tree.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_revision_tree.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_revision_tree.pyo
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_set_root_id.py
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_set_root_id.pyc
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_set_root_id.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_smart_add.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_smart_add.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_smart_add.pyo
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_unversion.py
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_unversion.pyc
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_unversion.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_walkdirs.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_walkdirs.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_walkdirs.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
@@ -1024,6 +1180,9 @@ ${PYSITELIB}/bzrlib/textmerge.pyo
 ${PYSITELIB}/bzrlib/textui.py
 ${PYSITELIB}/bzrlib/textui.pyc
 ${PYSITELIB}/bzrlib/textui.pyo
+${PYSITELIB}/bzrlib/timestamp.py
+${PYSITELIB}/bzrlib/timestamp.pyc
+${PYSITELIB}/bzrlib/timestamp.pyo
 ${PYSITELIB}/bzrlib/trace.py
 ${PYSITELIB}/bzrlib/trace.pyc
 ${PYSITELIB}/bzrlib/trace.pyo
@@ -1066,6 +1225,9 @@ ${PYSITELIB}/bzrlib/transport/http/_urllib.pyo
 ${PYSITELIB}/bzrlib/transport/http/_urllib2_wrappers.py
 ${PYSITELIB}/bzrlib/transport/http/_urllib2_wrappers.pyc
 ${PYSITELIB}/bzrlib/transport/http/_urllib2_wrappers.pyo
+${PYSITELIB}/bzrlib/transport/http/ca_bundle.py
+${PYSITELIB}/bzrlib/transport/http/ca_bundle.pyc
+${PYSITELIB}/bzrlib/transport/http/ca_bundle.pyo
 ${PYSITELIB}/bzrlib/transport/http/response.py
 ${PYSITELIB}/bzrlib/transport/http/response.pyc
 ${PYSITELIB}/bzrlib/transport/http/response.pyo
@@ -1120,6 +1282,9 @@ ${PYSITELIB}/bzrlib/urlutils.pyo
 ${PYSITELIB}/bzrlib/util/__init__.py
 ${PYSITELIB}/bzrlib/util/__init__.pyc
 ${PYSITELIB}/bzrlib/util/__init__.pyo
+${PYSITELIB}/bzrlib/util/bencode.py
+${PYSITELIB}/bzrlib/util/bencode.pyc
+${PYSITELIB}/bzrlib/util/bencode.pyo
 ${PYSITELIB}/bzrlib/util/configobj/__init__.py
 ${PYSITELIB}/bzrlib/util/configobj/__init__.pyc
 ${PYSITELIB}/bzrlib/util/configobj/__init__.pyo
@@ -1171,12 +1336,15 @@ ${PYSITELIB}/bzrlib/weave_commands.pyo
 ${PYSITELIB}/bzrlib/weavefile.py
 ${PYSITELIB}/bzrlib/weavefile.pyc
 ${PYSITELIB}/bzrlib/weavefile.pyo
-${PYSITELIB}/bzrlib/win32console.py
-${PYSITELIB}/bzrlib/win32console.pyc
-${PYSITELIB}/bzrlib/win32console.pyo
+${PYSITELIB}/bzrlib/win32utils.py
+${PYSITELIB}/bzrlib/win32utils.pyc
+${PYSITELIB}/bzrlib/win32utils.pyo
 ${PYSITELIB}/bzrlib/workingtree.py
 ${PYSITELIB}/bzrlib/workingtree.pyc
 ${PYSITELIB}/bzrlib/workingtree.pyo
+${PYSITELIB}/bzrlib/workingtree_4.py
+${PYSITELIB}/bzrlib/workingtree_4.pyc
+${PYSITELIB}/bzrlib/workingtree_4.pyo
 ${PYSITELIB}/bzrlib/xml4.py
 ${PYSITELIB}/bzrlib/xml4.pyc
 ${PYSITELIB}/bzrlib/xml4.pyo
@@ -1186,6 +1354,9 @@ ${PYSITELIB}/bzrlib/xml5.pyo
 ${PYSITELIB}/bzrlib/xml6.py
 ${PYSITELIB}/bzrlib/xml6.pyc
 ${PYSITELIB}/bzrlib/xml6.pyo
+${PYSITELIB}/bzrlib/xml7.py
+${PYSITELIB}/bzrlib/xml7.pyc
+${PYSITELIB}/bzrlib/xml7.pyo
 ${PYSITELIB}/bzrlib/xml_serializer.py
 ${PYSITELIB}/bzrlib/xml_serializer.pyc
 ${PYSITELIB}/bzrlib/xml_serializer.pyo
@@ -1216,6 +1387,7 @@ share/doc/bzr/version_info.txt
 @dirrm ${PYSITELIB}/bzrlib/tests/test_patches_data
 @dirrm ${PYSITELIB}/bzrlib/tests/revisionstore_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/repository_implementations
+@dirrm ${PYSITELIB}/bzrlib/tests/per_lock
 @dirrm ${PYSITELIB}/bzrlib/tests/interversionedfile_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/intertree_implementations
 @dirrm ${PYSITELIB}/bzrlib/tests/interrepository_implementations
@@ -1226,6 +1398,7 @@ share/doc/bzr/version_info.txt
 @dirrm ${PYSITELIB}/bzrlib/store/versioned
 @dirrm ${PYSITELIB}/bzrlib/store/revision
 @dirrm ${PYSITELIB}/bzrlib/store
+@dirrm ${PYSITELIB}/bzrlib/repofmt
 @dirrm ${PYSITELIB}/bzrlib/plugins/launchpad
 @dirrm ${PYSITELIB}/bzrlib/plugins
 @dirrm ${PYSITELIB}/bzrlib/export
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 7b356364fbf..dbeaf8822dd 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2007/03/22 20:25:10 recht Exp $
+$NetBSD: distinfo,v 1.11 2007/04/08 11:36:22 recht Exp $
 
-SHA1 (bzr-0.14.tar.gz) = 90c6278b332f369585ca6db47b65c4e7c60d6a6f
-RMD160 (bzr-0.14.tar.gz) = f75cd37e3c2d30ffc482f215cd60c47ee392f34e
-Size (bzr-0.14.tar.gz) = 1159335 bytes
+SHA1 (bzr-0.15.tar.gz) = 7d166093b9ff5a5ab02f3bb840d34fdc4a8ccd79
+RMD160 (bzr-0.15.tar.gz) = e3e6eeeff3df6dbd8ef9342b4a648a204cefae19
+Size (bzr-0.15.tar.gz) = 1363733 bytes
 SHA1 (patch-aa) = 8eda90885b3127525330cd3432538fb2b4df98c1
-SHA1 (patch-ab) = 64c09adc9da3b6f074f25b8a94c28d931d6ff48f
+SHA1 (patch-ab) = 8b8d5128510a2b08ab1a3815327bb6a9019c8f0d
diff --git a/devel/bzr/patches/patch-ab b/devel/bzr/patches/patch-ab
index 4c0f9ac9fbd..f645851989b 100644
--- a/devel/bzr/patches/patch-ab
+++ b/devel/bzr/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2007/03/22 20:25:10 recht Exp $
+$NetBSD: patch-ab,v 1.3 2007/04/08 11:36:22 recht Exp $
 
---- setup.py.orig	2007-01-23 02:59:36.000000000 +0100
-+++ setup.py	2007-03-22 21:18:22.000000000 +0100
-@@ -219,7 +219,7 @@
+--- setup.py.orig	2007-04-02 09:01:32.000000000 +0200
++++ setup.py	2007-04-08 13:12:16.000000000 +0200
+@@ -217,7 +217,7 @@
  else:
      # std setup
      ARGS = {'scripts': ['bzr'],