Update monotone and monotone-server to 0.29:

        0.29 release.  Code cleanups and bug fixes.

        New features:

        - The output of 'mtn status' has been changed significantly; the
          output formerly used by 'mtn status --brief' has become the
          default.  For output similar to the old 'mtn status', see
          'mtn automate get_revision'.

        - It is now significantly easier to control what merger
          monotone uses to resolve conflicts; for instance, to use
          emacs to resolve conflicts, add:
             merge = "emacs"
          to your .monotonerc file.  To override temporarily, you can
          also use the environment variable MTN_MERGE, which takes the
          same strings.  Currently recognized strings are "kdiff3",
          "xxdiff", "opendiff", "tortoisemerge", "emacs", "vim", and
          "meld".

        - Formerly, monotone's sync-over-ssh support required that an
          absolute path be used, with a URL like:
            ssh://venge.net/home/njs/my-db.mtn
          The following syntaxes are now supported as well:
            ssh://venge.net/~/my-db.mtn
            ssh://venge.net/~njs/my-db.mtn

        Bugs fixed:

        - The bug where monotone would sometimes respond to a control-C
          (or several other signals) by locking up and refusing to exit,
          has been fixed.

        - Monotone now properly respects SIGPIPE.  In particular, this
          means that 'mtn log | less' should now exit promptly when
          'less' is exited.

        - 'mtn log' now flushes its output after each message; this
          makes 'mtn log <FILES>' significantly more usable.

        - 'mtn log <FILES>' formerly listed irrelevant revisions (in
          particular, any revision which contained a delete of any files
          or directories, was always included).  This has been fixed.

        - If, during an update, two files both had conflicts, which,
          when resolved, resulting the two files becoming identical, the
          update would error out.  This has been fixed.

        - If _MTN/log exists and does not end in a newline, we now add a
          newline before using the log message.  This removes a problem
          where the string "MTN:" would end up appended to the last line
          of the log message.

        - We no longer buffer up an arbitrarily large number of pending
          writes in the database.  This improves speed and memory usage
          for 'commit', and fixes the problem where 'cvs_import' would
          run out of memory.

        - Monotone's tree walking code (used by 'ls unknown', 'ls
          missing', and friends) now uses much less memory, especially
          on reiserfs.

        Automate changes:

        - 'mtn automate stdio' now uses a configurable block size,
          controlled by command-line option --automate-stdio-size.  This
          is mostly useful for testing speed/memory trade-offs.

        - 'automate attributes' has a new format, which includes more
          information.

        Code cleanup:

        - We now use boost::program_options to parse command line
          options, rather than popt.  The only user-visible change
          should be that --option="" no longer works as a way to set
          some option to the empty string; use --option "".  (This
          change also removes a lot of orphaned and historically buggy
          code from monotone.)

        Other:

        - zsh completion script significantly revised and updated (see
          contrib/monotone.zsh_completion).

3 files changed, 9 insertions, 9 deletions

diff --git a/devel/monotone-server/Makefile b/devel/monotone-server/Makefile
index 4a7a0c2d640..4a35657efd6 100644
--- a/devel/monotone-server/Makefile
+++ b/devel/monotone-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2006/07/22 19:02:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2006/08/21 16:23:10 jmmv Exp $
 #
 
-DISTNAME=	monotone-server-0.28
+DISTNAME=	monotone-server-0.29
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,7 +10,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.venge.net/monotone/
 COMMENT=	Simplifies the configuration of a dedicated Monotone server
 
-DEPENDS+=	monotone>=0.28:../../devel/monotone
+DEPENDS+=	monotone>=0.29:../../devel/monotone
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index cad0d535524..231b9925963 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2006/07/22 19:02:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2006/08/21 16:23:10 jmmv Exp $
 #
 
-DISTNAME=	monotone-0.28
+DISTNAME=	monotone-0.29
 CATEGORIES=	devel
 MASTER_SITES=	http://www.venge.net/monotone/downloads/
 
diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index 493e84b2ce7..a4b6ffaec05 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2006/07/22 19:02:36 jmmv Exp $
+$NetBSD: distinfo,v 1.19 2006/08/21 16:23:10 jmmv Exp $
 
-SHA1 (monotone-0.28.tar.gz) = 19dbebc46455dc5060517f2cd6d8e686a8022ad9
-RMD160 (monotone-0.28.tar.gz) = 2f30996117f6694ea98bd7d02e55b322922a0649
-Size (monotone-0.28.tar.gz) = 4770156 bytes
+SHA1 (monotone-0.29.tar.gz) = 94753405fae972ded446244e2e6768a994defbd5
+RMD160 (monotone-0.29.tar.gz) = 00222f51b8888e1388fe6c0a29e9168eeafcf859
+Size (monotone-0.29.tar.gz) = 4544609 bytes