Update to 1.1 from Nick Goffee of BBN Technologies via private mail.

For the full list of changes, see NEWS.

   [many bugfixes]

   * The syntax ``bzr diff branch1 branch2`` is no longer supported.
     Use ``bzr diff branch1 --new branch2`` instead. This change has
     been made to remove the ambiguity where ``branch2`` is in fact a
     specific file to diff within ``branch1``.

   * diff '--using' allows an external diff tool to be used for files.
     (Aaron Bentley)

   * New "lca" merge-type for fast everyday merging that also supports
     criss-cross merges.  (Aaron Bentley)

   * ``merge`` now warns when merge directives cause cherrypicks.
     (Aaron Bentley)

   * ``split`` now supported, to enable splitting large trees into smaller
     pieces.  (Aaron Bentley)

   * Reference material has now be moved out of the User Guide and added
     to the User Reference. The User Reference has gained 4 sections as
     a result: Authenication Settings, Configuration Settings, Conflicts
     and Hooks. All help topics are now dumped into text format in the
     doc/en/user-reference directory for those who like browsing that
     information in their editor. (Ian Clatworthy)

   * Annotate merge (merge-type=weave) now supports cherrypicking.
     (Aaron Bentley)

   * ``switch`` can now be used on heavyweight checkouts as well as
     lightweight ones. After switching a heavyweight checkout, the
     local branch is a mirror/cache of the new bound branch and
     uncommitted changes in the working tree are merged. As a safety
     check, if there are local commits in a checkout which have not
     been committed to the previously bound branch, then ``switch``
     fails unless the ``--force`` option is given. This option is
     now also required if the branch a lightweight checkout is pointing
     to has been moved. (Ian Clatworthy)

   * The default repository format is now ``pack-0.92``.  This
     default is used when creating new repositories with ``init`` and
     ``init-repo``, and when branching over bzr+ssh or bzr+hpss.
     (See https://bugs.launchpad.net/bugs/164626)

     This format can be read and written by Bazaar 0.92 and later, and
     data can be transferred to and from older formats.

     To upgrade, please reconcile your repository (``bzr reconcile``), and then
     upgrade (``bzr upgrade``).

     ``pack-0.92`` offers substantially better scaling and performance than the
     previous knits format. Some operations are slower where the code already
     had bad scaling characteristics under knits, the pack format makes such
     operations more visible as part of being more scalable overall. We will
     correct such operations over the coming releases and encourage the filing
     of bugs on any operation which you observe to be slower in a packs
     repository. One particular case that we do not intend to fix is pulling
     data from a pack repository into a knit repository over a high latency
     link;  downgrading such data requires reinsertion of the file texts, and
     this is a classic space/time tradeoff. The current implementation is
     conservative on memory usage because we need to support converting data
     from any tree without problems.
     (Robert Collins, Martin Pool, #164476)

   * The pack format is now accessible as "pack-0.92", or "pack-0.92-subtree"
     to enable the subtree functions (for example, for bzr-svn).
     See http://doc.bazaar-vcs.org/latest/developer/packrepo.html
     (Martin Pool)

   * New ``authentication.conf`` file holding the password or other credentials
     for remote servers. This can be used for ssh, sftp, smtp and other
     supported transports.
     (Vincent Ladeuil)

   * ``switch`` command added for changing the branch a lightweight checkout
     is associated with and updating the tree to reflect the latest content
     accordingly. This command was previously part of the BzrTools plug-in.
     (Ian Clatworthy, Aaron Bentley, David Allouche)

   * ``reconfigure`` command can now convert branches, trees, or checkouts to
     lightweight checkouts.  (Aaron Bentley)

   * ``bzr merge`` now warns when it encounters a criss-cross merge.
     (Aaron Bentley)

3 files changed, 59 insertions, 16 deletions

diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 4aa7c1288a0..aa0411dc224 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2007/11/29 20:03:14 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2008/01/22 00:49:16 gdt Exp $
 #
 
-DISTNAME=		bzr-0.92
+DISTNAME=		bzr-1.1
 CATEGORIES=		devel scm
 MASTER_SITES=		http://bazaar-vcs.org/releases/src/
 
diff --git a/devel/bzr/PLIST b/devel/bzr/PLIST
index a67de0a8290..089683603ac 100644
--- a/devel/bzr/PLIST
+++ b/devel/bzr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/11/29 20:03:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/01/22 00:49:16 gdt Exp $
 bin/bzr
 ${PYSITELIB}/bzrlib/__init__.py
 ${PYSITELIB}/bzrlib/__init__.pyc
@@ -242,9 +242,13 @@ ${PYSITELIB}/bzrlib/hashcache.pyo
 ${PYSITELIB}/bzrlib/help.py
 ${PYSITELIB}/bzrlib/help.pyc
 ${PYSITELIB}/bzrlib/help.pyo
-${PYSITELIB}/bzrlib/help_topics.py
-${PYSITELIB}/bzrlib/help_topics.pyc
-${PYSITELIB}/bzrlib/help_topics.pyo
+${PYSITELIB}/bzrlib/help_topics/__init__.py
+${PYSITELIB}/bzrlib/help_topics/__init__.pyc
+${PYSITELIB}/bzrlib/help_topics/__init__.pyo
+${PYSITELIB}/bzrlib/help_topics/en/conflicts.txt
+${PYSITELIB}/bzrlib/help_topics/en/hooks.txt
+${PYSITELIB}/bzrlib/help_topics/en/configuration.txt
+${PYSITELIB}/bzrlib/help_topics/en/authentication.txt
 ${PYSITELIB}/bzrlib/hooks.py
 ${PYSITELIB}/bzrlib/hooks.pyc
 ${PYSITELIB}/bzrlib/hooks.pyo
@@ -296,6 +300,9 @@ ${PYSITELIB}/bzrlib/lockdir.pyo
 ${PYSITELIB}/bzrlib/log.py
 ${PYSITELIB}/bzrlib/log.pyc
 ${PYSITELIB}/bzrlib/log.pyo
+${PYSITELIB}/bzrlib/lru_cache.py
+${PYSITELIB}/bzrlib/lru_cache.pyc
+${PYSITELIB}/bzrlib/lru_cache.pyo
 ${PYSITELIB}/bzrlib/lsprof.py
 ${PYSITELIB}/bzrlib/lsprof.pyc
 ${PYSITELIB}/bzrlib/lsprof.pyo
@@ -479,6 +486,9 @@ ${PYSITELIB}/bzrlib/store/versioned/__init__.pyo
 ${PYSITELIB}/bzrlib/strace.py
 ${PYSITELIB}/bzrlib/strace.pyc
 ${PYSITELIB}/bzrlib/strace.pyo
+${PYSITELIB}/bzrlib/switch.py
+${PYSITELIB}/bzrlib/switch.pyc
+${PYSITELIB}/bzrlib/switch.pyo
 ${PYSITELIB}/bzrlib/symbol_versioning.py
 ${PYSITELIB}/bzrlib/symbol_versioning.pyc
 ${PYSITELIB}/bzrlib/symbol_versioning.pyo
@@ -491,12 +501,6 @@ ${PYSITELIB}/bzrlib/testament.pyo
 ${PYSITELIB}/bzrlib/tests/EncodingAdapter.py
 ${PYSITELIB}/bzrlib/tests/EncodingAdapter.pyc
 ${PYSITELIB}/bzrlib/tests/EncodingAdapter.pyo
-${PYSITELIB}/bzrlib/tests/HTTPTestUtil.py
-${PYSITELIB}/bzrlib/tests/HTTPTestUtil.pyc
-${PYSITELIB}/bzrlib/tests/HTTPTestUtil.pyo
-${PYSITELIB}/bzrlib/tests/HttpServer.py
-${PYSITELIB}/bzrlib/tests/HttpServer.pyc
-${PYSITELIB}/bzrlib/tests/HttpServer.pyo
 ${PYSITELIB}/bzrlib/tests/TestUtil.py
 ${PYSITELIB}/bzrlib/tests/TestUtil.pyc
 ${PYSITELIB}/bzrlib/tests/TestUtil.pyo
@@ -542,6 +546,9 @@ ${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_check.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_check.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_check.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_checkout.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_checkout.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_checkout.pyo
@@ -686,6 +693,9 @@ ${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_switch.py
+${PYSITELIB}/bzrlib/tests/blackbox/test_switch.pyc
+${PYSITELIB}/bzrlib/tests/blackbox/test_switch.pyo
 ${PYSITELIB}/bzrlib/tests/blackbox/test_tags.py
 ${PYSITELIB}/bzrlib/tests/blackbox/test_tags.pyc
 ${PYSITELIB}/bzrlib/tests/blackbox/test_tags.pyo
@@ -824,6 +834,15 @@ ${PYSITELIB}/bzrlib/tests/commands/test_push.pyo
 ${PYSITELIB}/bzrlib/tests/commands/test_update.py
 ${PYSITELIB}/bzrlib/tests/commands/test_update.pyc
 ${PYSITELIB}/bzrlib/tests/commands/test_update.pyo
+${PYSITELIB}/bzrlib/tests/ftp_server.py
+${PYSITELIB}/bzrlib/tests/ftp_server.pyc
+${PYSITELIB}/bzrlib/tests/ftp_server.pyo
+${PYSITELIB}/bzrlib/tests/http_server.py
+${PYSITELIB}/bzrlib/tests/http_server.pyc
+${PYSITELIB}/bzrlib/tests/http_server.pyo
+${PYSITELIB}/bzrlib/tests/http_utils.py
+${PYSITELIB}/bzrlib/tests/http_utils.pyc
+${PYSITELIB}/bzrlib/tests/http_utils.pyo
 ${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.py
 ${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.pyc
 ${PYSITELIB}/bzrlib/tests/interrepository_implementations/__init__.pyo
@@ -866,6 +885,9 @@ ${PYSITELIB}/bzrlib/tests/repository_implementations/__init__.pyo
 ${PYSITELIB}/bzrlib/tests/repository_implementations/helpers.py
 ${PYSITELIB}/bzrlib/tests/repository_implementations/helpers.pyc
 ${PYSITELIB}/bzrlib/tests/repository_implementations/helpers.pyo
+${PYSITELIB}/bzrlib/tests/repository_implementations/test__generate_text_key_index.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test__generate_text_key_index.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test__generate_text_key_index.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
@@ -884,6 +906,9 @@ ${PYSITELIB}/bzrlib/tests/repository_implementations/test_fetch.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_find_text_key_references.py
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_find_text_key_references.pyc
+${PYSITELIB}/bzrlib/tests/repository_implementations/test_find_text_key_references.pyo
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_has_same_location.py
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_has_same_location.pyc
 ${PYSITELIB}/bzrlib/tests/repository_implementations/test_has_same_location.pyo
@@ -1037,6 +1062,9 @@ ${PYSITELIB}/bzrlib/tests/test_hooks.pyo
 ${PYSITELIB}/bzrlib/tests/test_http.py
 ${PYSITELIB}/bzrlib/tests/test_http.pyc
 ${PYSITELIB}/bzrlib/tests/test_http.pyo
+${PYSITELIB}/bzrlib/tests/test_http_implementations.py
+${PYSITELIB}/bzrlib/tests/test_http_implementations.pyc
+${PYSITELIB}/bzrlib/tests/test_http_implementations.pyo
 ${PYSITELIB}/bzrlib/tests/test_http_response.py
 ${PYSITELIB}/bzrlib/tests/test_http_response.pyc
 ${PYSITELIB}/bzrlib/tests/test_http_response.pyo
@@ -1076,6 +1104,9 @@ ${PYSITELIB}/bzrlib/tests/test_lockdir.pyo
 ${PYSITELIB}/bzrlib/tests/test_log.py
 ${PYSITELIB}/bzrlib/tests/test_log.pyc
 ${PYSITELIB}/bzrlib/tests/test_log.pyo
+${PYSITELIB}/bzrlib/tests/test_lru_cache.py
+${PYSITELIB}/bzrlib/tests/test_lru_cache.pyc
+${PYSITELIB}/bzrlib/tests/test_lru_cache.pyo
 ${PYSITELIB}/bzrlib/tests/test_lsprof.py
 ${PYSITELIB}/bzrlib/tests/test_lsprof.pyc
 ${PYSITELIB}/bzrlib/tests/test_lsprof.pyo
@@ -1231,6 +1262,9 @@ ${PYSITELIB}/bzrlib/tests/test_strace.pyo
 ${PYSITELIB}/bzrlib/tests/test_subsume.py
 ${PYSITELIB}/bzrlib/tests/test_subsume.pyc
 ${PYSITELIB}/bzrlib/tests/test_subsume.pyo
+${PYSITELIB}/bzrlib/tests/test_switch.py
+${PYSITELIB}/bzrlib/tests/test_switch.pyc
+${PYSITELIB}/bzrlib/tests/test_switch.pyo
 ${PYSITELIB}/bzrlib/tests/test_symbol_versioning.py
 ${PYSITELIB}/bzrlib/tests/test_symbol_versioning.pyc
 ${PYSITELIB}/bzrlib/tests/test_symbol_versioning.pyo
@@ -1324,6 +1358,9 @@ ${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_root_id.py
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_root_id.pyc
+${PYSITELIB}/bzrlib/tests/tree_implementations/test_get_root_id.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
@@ -1621,6 +1658,9 @@ ${PYSITELIB}/bzrlib/version.pyo
 ${PYSITELIB}/bzrlib/version_info_formats/__init__.py
 ${PYSITELIB}/bzrlib/version_info_formats/__init__.pyc
 ${PYSITELIB}/bzrlib/version_info_formats/__init__.pyo
+${PYSITELIB}/bzrlib/version_info_formats/format_custom.py
+${PYSITELIB}/bzrlib/version_info_formats/format_custom.pyc
+${PYSITELIB}/bzrlib/version_info_formats/format_custom.pyo
 ${PYSITELIB}/bzrlib/version_info_formats/format_python.py
 ${PYSITELIB}/bzrlib/version_info_formats/format_python.pyc
 ${PYSITELIB}/bzrlib/version_info_formats/format_python.pyo
@@ -1631,6 +1671,7 @@ ${PYSITELIB}/bzrlib/versionedfile.py
 ${PYSITELIB}/bzrlib/versionedfile.pyc
 ${PYSITELIB}/bzrlib/versionedfile.pyo
 ${PYSITELIB}/bzrlib/weave.py
+${PYSITELIB}/bzrlib/weave.py
 ${PYSITELIB}/bzrlib/weave.pyc
 ${PYSITELIB}/bzrlib/weave.pyo
 ${PYSITELIB}/bzrlib/weave_commands.py
@@ -1698,6 +1739,8 @@ share/doc/bzr/index.txt
 @dirrm ${PYSITELIB}/bzrlib/repofmt
 @dirrm ${PYSITELIB}/bzrlib/plugins/launchpad
 @dirrm ${PYSITELIB}/bzrlib/plugins
+@dirrm ${PYSITELIB}/bzrlib/help_topics/en
+@dirrm ${PYSITELIB}/bzrlib/help_topics
 @dirrm ${PYSITELIB}/bzrlib/export
 @dirrm ${PYSITELIB}/bzrlib/doc/api
 @dirrm ${PYSITELIB}/bzrlib/doc
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 320d08bc9ba..00c00856407 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2007/11/29 20:03:14 wiz Exp $
+$NetBSD: distinfo,v 1.16 2008/01/22 00:49:16 gdt Exp $
 
-SHA1 (bzr-0.92.tar.gz) = 51901b0c467e30dab9e51b990bb491752460d680
-RMD160 (bzr-0.92.tar.gz) = f7a6c24944be50c830c25376bfaf0d2b8c56ae56
-Size (bzr-0.92.tar.gz) = 1879050 bytes
+SHA1 (bzr-1.1.tar.gz) = a34af746c6c9fef5c8d063fab892e368aa7e74ab
+RMD160 (bzr-1.1.tar.gz) = 1a57f127bb452aa842d6c1a41578cea964bc1bf3
+Size (bzr-1.1.tar.gz) = 3425781 bytes
 SHA1 (patch-aa) = 8eda90885b3127525330cd3432538fb2b4df98c1
 SHA1 (patch-ab) = 2213a002f9bc0f5baba0554b6b375becf4d98d9c