Update to 0.40. Tested in NetBSD-current/amd64 and OS X 10.4.

Changes

- The vim merger has been improved and now uses diff3 to merge
  non-conflict changes automatically before executing vimdiff.

- Values used with the --depth option used to control recursion with
  node and path restrictions have changed. Using --depth=0 now means
  exactly the specified directories and *not* their children. Using
  --depth=1 now means the specified directories and their immediate
  children. Previously --depth=0 included children and --depth=1
  included grandchildren and it was not possible to exclude children
  using --depth.  The simple fix for anyone using --depth is to add 1 to
  the values they are using.

- Document that ssh: and file: sync transports are not supported on
  native Win32.

Bugs fixed

- `commit' now uses keydir specified in _MTN/options

- duplicate name conflicts now show a proper error message, even if
  a parent directory got renamed as well. In that case, the error
  message now shows both names for the directory and the offending
  file name.

New features

- The bare parent selector 'p:' can now be used in a workspace to
  query the parent(s) of the workspace' base revision. This is
  equivalent to "mtn au select p:`mtn au get_base_workspace_revision`".

- push, pull, and sync can be run with a single argument, which looks
  like
     mtn://hostname?include_pattenr/-exclude_pattern
  or
     mtn://hostname?include=include_pattern/exclude=exclude_pattern

Internal

- Update Botan to 1.7.4.

- Usage of the internal app_state object has been reduced, objects
  are better encapsulated now. The database interface has been
  enhanced to ease reduction of locking contention in the future.

- Merged the two indexes on revision_certs into a single one.

- The database schema has been changed so that it now stores
  binary SHA1 hashes rather than their hexadecimal encoding,
  in most places where these are used.  This reduces the
  database size and speeds up operations a little.

  Users who like to fiddle with the database directly are
  advised to use the sqlite functions hex() and quote() to
  print columns that store hashes (including IDs), and the
  hexadecimal literal notation x'DEADBEEF' to input them.

- Binary SHA1 hashes are also used for most in-memory
  processing, avoiding conversions and saving memory.

2 files changed, 7 insertions, 7 deletions

diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 69670cff427..ed697ed6746 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2008/02/27 14:16:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.51 2008/04/12 14:34:50 jmmv Exp $
 #
 
-DISTNAME=	monotone-0.39
+DISTNAME=	monotone-0.40
 CATEGORIES=	devel scm
-MASTER_SITES=	http://monotone.ca/downloads/0.39/
+MASTER_SITES=	http://monotone.ca/downloads/0.40/
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://monotone.ca/
diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index adf7fa27260..9cf88c2e350 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.36 2008/02/27 14:16:50 jmmv Exp $
+$NetBSD: distinfo,v 1.37 2008/04/12 14:34:50 jmmv Exp $
 
-SHA1 (monotone-0.39.tar.gz) = b34c7e25871ddff1e30d15b733c1f3283ec16de9
-RMD160 (monotone-0.39.tar.gz) = d559c318e18f801513a170936fb56b6e1ac41235
-Size (monotone-0.39.tar.gz) = 5332200 bytes
+SHA1 (monotone-0.40.tar.gz) = f1fda6b1d75a359488d09599995526e71a5ef481
+RMD160 (monotone-0.40.tar.gz) = 142ae0723337bff0cec5701d50fdd0eb41659e6c
+Size (monotone-0.40.tar.gz) = 5366351 bytes
 SHA1 (patch-aa) = 6aa0a991d94859085e1674cdea522dcd7d6436ed