Update to 0.17:

bzr 0.17  2007-06-18

  BUGFIXES

bzr 0.17rc1  2007-06-12

  NOTES WHEN UPGRADING:

    * The kind() and is_executable() APIs on the WorkingTree interface no
      longer implicitly (read) locks and unlocks the tree. This *might*
      impact some plug-ins and tools using this part of the API. If you find
      an issue that may be caused by this change, please let us know,
      particularly the plug-in/tool maintainer. If encountered, the API
      fix is to surround kind() and is_executable() calls with lock_read()
      and unlock() like so::

        work_tree.lock_read()
        try:
            kind = work_tree.kind(...)
        finally:
            work_tree.unlock()

  IMPROVEMENTS:

    * There are two new help topics, working-trees and repositories that
      attempt to explain these concepts. (James Westby, John Arbash Meinel,
      Aaron Bentley)

    * Added ``bzr log --limit`` to report a limited number of revisions.
      (Kent Gibson, #3659)

    * Revert does not try to preserve file contents that were originally
      produced by reverting to a historical revision.  (Aaron Bentley)

    * ``bzr log --short`` now includes ``[merge]`` for revisions which
      have more than one parent. This is a small improvement to help
      understanding what changes have occurred
      (John Arbash Meinel, #83887)

    * TreeTransform avoids many renames when contructing large trees,
      improving speed.  3.25x speedups have been observed for construction of
      kernel-sized-trees, and checkouts are 1.28x faster.  (Aaron Bentley)

    * Commit on large trees is now faster. In my environment, a commit of
      a small change to the Mozilla tree (55k files) has dropped from
      66 seconds to 32 seconds. For a small tree of 600 files, commit of a
      small change is 33% faster. (Ian Clatworthy)

    * New --create-prefix option to bzr init, like for push.  (Daniel Watkins,
      #56322)

  BUGFIXES

bzr 0.16  2007-05-07

  BUGFIXES

  IMPROVEMENTS:

    * Move developer documentation to doc/developers/. This reduces clutter in
      the root of the source tree and allows HACKING to be split into multiple
      files. (Robert Collins, Alexander Belchenko)

    * Clean up the ``WorkingTree4._iter_changes()`` internal loops as well as
      ``DirState.update_entry()``. This optimizes the core logic for ``bzr
      diff`` and ``bzr status`` significantly improving the speed of
      both. (John Arbash Meinel)

bzr 0.16rc2  2007-04-30

  BUGFIXES

bzr 0.16rc1  2007-04-26

  NOTES WHEN UPGRADING:

    * ``bzr remove`` and ``bzr rm`` will now remove the working file, if
      it could be recovered again.
      This has been done for consistency with svn and the unix rm command.
      The old ``remove`` behaviour has been retained in the new option
      ``bzr remove --keep``, which will just stop versioning the file,
      but not delete it.
      ``bzr remove --force`` have been added which will always delete the
      files.
      ``bzr remove`` is also more verbose.
      (Marius Kruger, #82602)

  IMPROVEMENTS:

    * Merge directives can now be supplied as input to `merge` and `pull`,
      like bundles can.  (Aaron Bentley)

    * Sending the SIGQUIT signal to bzr, which can be done on Unix by
      pressing Control-Backslash, drops bzr into a debugger.  Type ``'c'``
      to continue.  This can be disabled by setting the environment variable
      ``BZR_SIGQUIT_PDB=0``.  (Martin Pool)

    * selftest now supports --list-only to list tests instead of running
      them. (Ian Clatworthy)

    * selftest now supports --exclude PATTERN (or -x PATTERN) to exclude
      tests with names that match that regular expression.
      (Ian Clatworthy, #102679)

    * selftest now supports --randomize SEED to run tests in a random order.
      SEED is typically the value 'now' meaning 'use the current time'.
      (Ian Clatworthy, #102686)

    * New option ``--fixes`` to commit, which stores bug fixing annotations as
      revision properties. Built-in support for Launchpad, Debian, Trac and
      Bugzilla bug trackers. (Jonathan Lange, James Henstridge, Robert Collins)

    * New API, ``bzrlib.bugtracker.tracker_registry``, for adding support for
      other bug trackers to ``fixes``. (Jonathan Lange, James Henstridge,
      Robert Collins)

    * ``selftest`` has new short options ``-f`` and ``-1``.  (Martin
      Pool)

    * ``bzrlib.tsort.MergeSorter`` optimizations. Change the inner loop
      into using local variables instead of going through ``self._var``.
      Improves the time to ``merge_sort`` a 10k revision graph by
      approximately 40% (~700->400ms).  (John Arbash Meinel)

    * ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
      (Robert Collins)

    * ``bzr help`` now provides cross references to other help topics using
      the _see_also facility on command classes. Likewise the bzr_man
      documentation, and the bzr.1 man page also include this information.
      (Robert Collins)

    * Tags are now included in logs, that use the long log formatter.
      (Erik Bågfors, Alexander Belchenko)

    * ``bzr help`` provides a clearer message when a help topic cannot be
      found. (Robert Collins, #107656)

    * ``bzr help`` now accepts optional prefixes for command help. The help
      for all commands can now be found at ``bzr help commands/COMMANDNAME``
      as well as ``bzr help COMMANDNAME`` (which only works for commands
      where the name is not the same as a more general help topic).
      (Robert Collins)

    * ``bzr help PLUGINNAME`` will now return the module docstring from the
      plugin PLUGINNAME. (Robert Collins, #50408)

    * New help topic ``urlspec`` which lists the availables transports.
      (Goffredo Baroncelli)

    * doc/server.txt updated to document the default bzr:// port
      and also update the blurb about the hpss' current status.
      (Robert Collins, #107125).

    * ``bzr serve`` now listens on interface 0.0.0.0 by default, making it
      serve out to the local LAN (and anyone in the world that can reach the
      machine running ``bzr serve``. (Robert Collins, #98918)

    * A new smart server protocol version has been added.  It prefixes requests
      and responses with an explicit version identifier so that future protocol
      revisions can be dealt with gracefully.  (Andrew Bennetts, Robert Collins)

    * The bzr protocol version 2 indicates success or failure in every response
      without depending on particular commands encoding that consistently,
      allowing future client refactorings to be much more robust about error
      handling. (Robert Collins, Martin Pool, Andrew Bennetts)

    * The smart protocol over HTTP client has been changed to always post to the
      same ``.bzr/smart`` URL under the original location when it can.  This allows
      HTTP servers to only have to pass URLs ending in .bzr/smart to the smart
      server handler, and not arbitrary ``.bzr/*/smart`` URLs.  (Andrew Bennetts)

    * digest authentication is now supported for proxies and HTTP by the urllib
      based http implementation. Tested against Apache 2.0.55 and Squid
      2.6.5. Basic and digest authentication are handled coherently for HTTP
      and proxy: if the user is provided in the url (bzr command line for HTTP,
      proxy environment variables for proxies), the password is prompted for
      (only once). If the password is provided, it is taken into account. Once
      the first authentication is successful, all further authentication
      roundtrips are avoided by preventively setting the right authentication
      header(s).
      (Vincent Ladeuil).

  BUGFIXES

4 files changed, 116 insertions, 21 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 950fb6c3d25..7af2a95a7da 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/04/08 11:36:22 recht Exp $
+# $NetBSD: Makefile,v 1.14 2007/07/08 19:53:21 wiz Exp $
 #
 
-DISTNAME=		bzr-0.15
+DISTNAME=		bzr-0.17
 CATEGORIES=		devel scm
 MASTER_SITES=		http://bazaar-vcs.org/releases/src/
 
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index 7399fe1e294..91f2da79000 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/04/08 11:36:22 recht Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/07/08 19:53:21 wiz Exp $
 bin/bzr
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
@@ -84,6 +84,15 @@ ${PYSITELIB}/bzrlib/benchmarks/tree_creator/simple_many_commit.pyo
 ${PYSITELIB}/bzrlib/branch.py
 ${PYSITELIB}/bzrlib/branch.pyc
 ${PYSITELIB}/bzrlib/branch.pyo
+${PYSITELIB}/bzrlib/branchbuilder.py
+${PYSITELIB}/bzrlib/branchbuilder.pyc
+${PYSITELIB}/bzrlib/branchbuilder.pyo
+${PYSITELIB}/bzrlib/breakin.py
+${PYSITELIB}/bzrlib/breakin.pyc
+${PYSITELIB}/bzrlib/breakin.pyo
+${PYSITELIB}/bzrlib/bugtracker.py
+${PYSITELIB}/bzrlib/bugtracker.pyc
+${PYSITELIB}/bzrlib/bugtracker.pyo
 ${PYSITELIB}/bzrlib/builtins.py
 ${PYSITELIB}/bzrlib/builtins.pyc
 ${PYSITELIB}/bzrlib/builtins.pyo
@@ -135,6 +144,9 @@ ${PYSITELIB}/bzrlib/config.pyo
 ${PYSITELIB}/bzrlib/conflicts.py
 ${PYSITELIB}/bzrlib/conflicts.pyc
 ${PYSITELIB}/bzrlib/conflicts.pyo
+${PYSITELIB}/bzrlib/counted_lock.py
+${PYSITELIB}/bzrlib/counted_lock.pyc
+${PYSITELIB}/bzrlib/counted_lock.pyo
 ${PYSITELIB}/bzrlib/debug.py
 ${PYSITELIB}/bzrlib/debug.pyc
 ${PYSITELIB}/bzrlib/debug.pyo
@@ -200,6 +212,9 @@ ${PYSITELIB}/bzrlib/help.pyo
 ${PYSITELIB}/bzrlib/help_topics.py
 ${PYSITELIB}/bzrlib/help_topics.pyc
 ${PYSITELIB}/bzrlib/help_topics.pyo
+${PYSITELIB}/bzrlib/hooks.py
+${PYSITELIB}/bzrlib/hooks.pyc
+${PYSITELIB}/bzrlib/hooks.pyo
 ${PYSITELIB}/bzrlib/identitymap.py
 ${PYSITELIB}/bzrlib/identitymap.pyc
 ${PYSITELIB}/bzrlib/identitymap.pyo
@@ -314,6 +329,9 @@ ${PYSITELIB}/bzrlib/reconcile.pyo
 ${PYSITELIB}/bzrlib/registry.py
 ${PYSITELIB}/bzrlib/registry.pyc
 ${PYSITELIB}/bzrlib/registry.pyo
+${PYSITELIB}/bzrlib/remote.py
+${PYSITELIB}/bzrlib/remote.pyc
+${PYSITELIB}/bzrlib/remote.pyo
 ${PYSITELIB}/bzrlib/repofmt/__init__.py
 ${PYSITELIB}/bzrlib/repofmt/__init__.pyc
 ${PYSITELIB}/bzrlib/repofmt/__init__.pyo
@@ -344,6 +362,36 @@ ${PYSITELIB}/bzrlib/shellcomplete.pyo
 ${PYSITELIB}/bzrlib/sign_my_commits.py
 ${PYSITELIB}/bzrlib/sign_my_commits.pyc
 ${PYSITELIB}/bzrlib/sign_my_commits.pyo
+${PYSITELIB}/bzrlib/smart/__init__.py
+${PYSITELIB}/bzrlib/smart/__init__.pyc
+${PYSITELIB}/bzrlib/smart/__init__.pyo
+${PYSITELIB}/bzrlib/smart/branch.py
+${PYSITELIB}/bzrlib/smart/branch.pyc
+${PYSITELIB}/bzrlib/smart/branch.pyo
+${PYSITELIB}/bzrlib/smart/bzrdir.py
+${PYSITELIB}/bzrlib/smart/bzrdir.pyc
+${PYSITELIB}/bzrlib/smart/bzrdir.pyo
+${PYSITELIB}/bzrlib/smart/client.py
+${PYSITELIB}/bzrlib/smart/client.pyc
+${PYSITELIB}/bzrlib/smart/client.pyo
+${PYSITELIB}/bzrlib/smart/medium.py
+${PYSITELIB}/bzrlib/smart/medium.pyc
+${PYSITELIB}/bzrlib/smart/medium.pyo
+${PYSITELIB}/bzrlib/smart/protocol.py
+${PYSITELIB}/bzrlib/smart/protocol.pyc
+${PYSITELIB}/bzrlib/smart/protocol.pyo
+${PYSITELIB}/bzrlib/smart/repository.py
+${PYSITELIB}/bzrlib/smart/repository.pyc
+${PYSITELIB}/bzrlib/smart/repository.pyo
+${PYSITELIB}/bzrlib/smart/request.py
+${PYSITELIB}/bzrlib/smart/request.pyc
+${PYSITELIB}/bzrlib/smart/request.pyo
+${PYSITELIB}/bzrlib/smart/server.py
+${PYSITELIB}/bzrlib/smart/server.pyc
+${PYSITELIB}/bzrlib/smart/server.pyo
+${PYSITELIB}/bzrlib/smart/vfs.py
+${PYSITELIB}/bzrlib/smart/vfs.pyc
+${PYSITELIB}/bzrlib/smart/vfs.pyo
 ${PYSITELIB}/bzrlib/status.py
 ${PYSITELIB}/bzrlib/status.pyc
 ${PYSITELIB}/bzrlib/status.pyo
@@ -365,6 +413,9 @@ ${PYSITELIB}/bzrlib/store/text.pyo
 ${PYSITELIB}/bzrlib/store/versioned/__init__.py
 ${PYSITELIB}/bzrlib/store/versioned/__init__.pyc
 ${PYSITELIB}/bzrlib/store/versioned/__init__.pyo
+${PYSITELIB}/bzrlib/strace.py
+${PYSITELIB}/bzrlib/strace.pyc
+${PYSITELIB}/bzrlib/strace.pyo
 ${PYSITELIB}/bzrlib/symbol_versioning.py
 ${PYSITELIB}/bzrlib/symbol_versioning.pyc
 ${PYSITELIB}/bzrlib/symbol_versioning.pyo
@@ -416,12 +467,18 @@ ${PYSITELIB}/bzrlib/tests/blackbox/test_branch.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_breakin.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_breakin.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_breakin.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_bundle.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_bundle.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_bundle.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_cat_revision.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_cat_revision.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_cat_revision.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_checkout.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_checkout.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_checkout.pyo
@@ -602,6 +659,9 @@ ${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_get_revision_id_to_revno_map.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.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
@@ -626,6 +686,15 @@ ${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_revision_history.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_history.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_history.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_id_to_revno.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_revision_id_to_revno.pyo
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_sprout.py
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_sprout.pyc
+${PYSITELIB}/bzrlib/tests/branch_implementations/test_sprout.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
@@ -725,6 +794,12 @@ ${PYSITELIB}/bzrlib/tests/test_bad_files.pyo
 ${PYSITELIB}/bzrlib/tests/test_branch.py
 ${PYSITELIB}/bzrlib/tests/test_branch.pyc
 ${PYSITELIB}/bzrlib/tests/test_branch.pyo
+${PYSITELIB}/bzrlib/tests/test_branchbuilder.py
+${PYSITELIB}/bzrlib/tests/test_branchbuilder.pyc
+${PYSITELIB}/bzrlib/tests/test_branchbuilder.pyo
+${PYSITELIB}/bzrlib/tests/test_bugtracker.py
+${PYSITELIB}/bzrlib/tests/test_bugtracker.pyc
+${PYSITELIB}/bzrlib/tests/test_bugtracker.pyo
 ${PYSITELIB}/bzrlib/tests/test_bundle.py
 ${PYSITELIB}/bzrlib/tests/test_bundle.pyc
 ${PYSITELIB}/bzrlib/tests/test_bundle.pyo
@@ -749,6 +824,9 @@ ${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_counted_lock.py
+${PYSITELIB}/bzrlib/tests/test_counted_lock.pyc
+${PYSITELIB}/bzrlib/tests/test_counted_lock.pyo
 ${PYSITELIB}/bzrlib/tests/test_decorators.py
 ${PYSITELIB}/bzrlib/tests/test_decorators.pyc
 ${PYSITELIB}/bzrlib/tests/test_decorators.pyo
@@ -761,9 +839,6 @@ ${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
 ${PYSITELIB}/bzrlib/tests/test_errors.py
 ${PYSITELIB}/bzrlib/tests/test_errors.pyc
 ${PYSITELIB}/bzrlib/tests/test_errors.pyo
@@ -797,6 +872,9 @@ ${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_help.py
+${PYSITELIB}/bzrlib/tests/test_help.pyc
+${PYSITELIB}/bzrlib/tests/test_help.pyo
 ${PYSITELIB}/bzrlib/tests/test_http.py
 ${PYSITELIB}/bzrlib/tests/test_http.pyc
 ${PYSITELIB}/bzrlib/tests/test_http.pyo
@@ -910,6 +988,9 @@ ${PYSITELIB}/bzrlib/tests/test_reconcile.pyo
 ${PYSITELIB}/bzrlib/tests/test_registry.py
 ${PYSITELIB}/bzrlib/tests/test_registry.pyc
 ${PYSITELIB}/bzrlib/tests/test_registry.pyo
+${PYSITELIB}/bzrlib/tests/test_remote.py
+${PYSITELIB}/bzrlib/tests/test_remote.pyc
+${PYSITELIB}/bzrlib/tests/test_remote.pyo
 ${PYSITELIB}/bzrlib/tests/test_repository.py
 ${PYSITELIB}/bzrlib/tests/test_repository.pyc
 ${PYSITELIB}/bzrlib/tests/test_repository.pyo
@@ -940,6 +1021,9 @@ ${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.py
+${PYSITELIB}/bzrlib/tests/test_smart.pyc
+${PYSITELIB}/bzrlib/tests/test_smart.pyo
 ${PYSITELIB}/bzrlib/tests/test_smart_add.py
 ${PYSITELIB}/bzrlib/tests/test_smart_add.pyc
 ${PYSITELIB}/bzrlib/tests/test_smart_add.pyo
@@ -958,6 +1042,9 @@ ${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_strace.py
+${PYSITELIB}/bzrlib/tests/test_strace.pyc
+${PYSITELIB}/bzrlib/tests/test_strace.pyo
 ${PYSITELIB}/bzrlib/tests/test_subsume.py
 ${PYSITELIB}/bzrlib/tests/test_subsume.pyc
 ${PYSITELIB}/bzrlib/tests/test_subsume.pyo
@@ -1102,6 +1189,9 @@ ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_executable.pyo
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_flush.py
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_flush.pyc
 ${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_flush.pyo
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_file_mtime.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_file_mtime.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_get_file_mtime.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
@@ -1147,6 +1237,9 @@ ${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_remove.py
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_remove.pyc
+${PYSITELIB}/bzrlib/tests/workingtree_implementations/test_remove.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
@@ -1243,12 +1336,12 @@ ${PYSITELIB}/bzrlib/transport/memory.pyo
 ${PYSITELIB}/bzrlib/transport/readonly.py
 ${PYSITELIB}/bzrlib/transport/readonly.pyc
 ${PYSITELIB}/bzrlib/transport/readonly.pyo
+${PYSITELIB}/bzrlib/transport/remote.py
+${PYSITELIB}/bzrlib/transport/remote.pyc
+${PYSITELIB}/bzrlib/transport/remote.pyo
 ${PYSITELIB}/bzrlib/transport/sftp.py
 ${PYSITELIB}/bzrlib/transport/sftp.pyc
 ${PYSITELIB}/bzrlib/transport/sftp.pyo
-${PYSITELIB}/bzrlib/transport/smart.py
-${PYSITELIB}/bzrlib/transport/smart.pyc
-${PYSITELIB}/bzrlib/transport/smart.pyo
 ${PYSITELIB}/bzrlib/transport/ssh.py
 ${PYSITELIB}/bzrlib/transport/ssh.pyc
 ${PYSITELIB}/bzrlib/transport/ssh.pyo
@@ -1368,6 +1461,7 @@ share/doc/bzr/index.txt
 share/doc/bzr/plugins.txt
 share/doc/bzr/server.txt
 share/doc/bzr/setting_up_email.txt
+share/doc/bzr/shared_repository_layouts.txt
 share/doc/bzr/specifying_revisions.txt
 share/doc/bzr/tutorial.txt
 share/doc/bzr/using_aliases.txt
@@ -1398,6 +1492,7 @@ share/doc/bzr/version_info.txt
 @dirrm ${PYSITELIB}/bzrlib/store/versioned
 @dirrm ${PYSITELIB}/bzrlib/store/revision
 @dirrm ${PYSITELIB}/bzrlib/store
+@dirrm ${PYSITELIB}/bzrlib/smart
 @dirrm ${PYSITELIB}/bzrlib/repofmt
 @dirrm ${PYSITELIB}/bzrlib/plugins/launchpad
 @dirrm ${PYSITELIB}/bzrlib/plugins
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index dbeaf8822dd..251e4b129fb 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2007/04/08 11:36:22 recht Exp $
+$NetBSD: distinfo,v 1.12 2007/07/08 19:53:21 wiz Exp $
 
-SHA1 (bzr-0.15.tar.gz) = 7d166093b9ff5a5ab02f3bb840d34fdc4a8ccd79
-RMD160 (bzr-0.15.tar.gz) = e3e6eeeff3df6dbd8ef9342b4a648a204cefae19
-Size (bzr-0.15.tar.gz) = 1363733 bytes
+SHA1 (bzr-0.17.tar.gz) = bd5b8fb0a4ee73f023e7b1cf365fc3aa1064ca12
+RMD160 (bzr-0.17.tar.gz) = f459a59013242e985403e3d451ee8d3c0f3d38b8
+Size (bzr-0.17.tar.gz) = 1500584 bytes
 SHA1 (patch-aa) = 8eda90885b3127525330cd3432538fb2b4df98c1
-SHA1 (patch-ab) = 8b8d5128510a2b08ab1a3815327bb6a9019c8f0d
+SHA1 (patch-ab) = 6b4621cf71d0f0f9061d34cf954d18c8d0fbc0b4
diff --git a/devel/bzr/patches/patch-ab b/devel/bzr/patches/patch-ab
index f645851989b..f1aa8871657 100644
--- a/devel/bzr/patches/patch-ab
+++ b/devel/bzr/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2007/04/08 11:36:22 recht Exp $
+$NetBSD: patch-ab,v 1.4 2007/07/08 19:53:21 wiz Exp $
 
---- 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 @@
+--- setup.py.orig	2007-06-18 05:09:04.000000000 +0000
++++ setup.py
+@@ -239,7 +239,7 @@ elif 'py2exe' in sys.argv:
  else:
      # std setup
      ARGS = {'scripts': ['bzr'],
 -            'data_files': [('man/man1', ['bzr.1'])],
 +            'data_files': [(os.getenv('PKGMANDIR', 'man') + '/man1', ['bzr.1'])],
-             'cmdclass': {'build': bzr_build,
-                          'install_scripts': my_install_scripts,
-                         },
+             'cmdclass': command_classes,
+             'ext_modules': ext_modules,
+            }