Merge lp:~maxb/ubuntu/lucid/subversion/merge into lp:ubuntu/lucid/subversion

[Max Bowsher]

[lp:~maxb/ubuntu/lucid/subversion/merge]

41. By Max Bowsher on 2009-12-11

Per request of Scott Kitterman, revert changing XS-Python-Version to all,
restoring the line from Debian.

42. By Max Bowsher on 2009-12-11

Add LP bug numbers to the changelog for bugs closed by merge.

43. By Max Bowsher on 2009-12-11

Amend the XS-Python-Version line to ">= 2.4" rather than explicit versions.
(Explicit versions which are not available via python-all cause FTBFS.)

44. By Scott Kitterman on 2009-12-12

Changelog tweaks by my sponsor prior to uploading.

[Max Bowsher (maxb)]

This has been uploaded to the archive.

=== modified file 'CHANGES'
--- CHANGES	2009-08-24 19:09:22 +0000
+++ CHANGES	2009-12-12 13:21:15 +0000
@@ -1,9 +1,40 @@
+Version 1.6.6
+(16 Oct 2009, from /branches/1.6.x)
+http://svn.collab.net/repos/svn/tags/1.6.6
+
+ User-visible changes:
+  * fix crash during 'svn update' (r39673)
+  * respect Apache's ServerSignature directive (r40008, -21, -31)
+  * don't add a file with mixed line endings, and then abort (issue #2713)
+  * support Neon 0.29.
+  * fix a crash in 'svn rm --force' (r37953)
+  * handle tree conflicts involving replacements (issue #3486)
+  * allow non-threadsafe sqlite if APR has no threads (r39301)
+  * print newline before plaintext SSL cert / password prompts (r38982, r39302)
+  * improve merge performance with implicit subtree mergeinfo (issue #3443)
+  * fix "libsvn_ra_svn/marshal.c assertion failed (opt || cstr)" (issue #3485)
+  * make file externals work for binary files (issue #3368)
+  * perform MIME type matching case-insensitively (issue #3479)
+  * do not treat non-existent revisions as HEAD in 'svn export' (issue #3400)
+  * revert r36720's default MIME type change back to "text/plain" (issue #3508)
+  * improve "tree conflict already exists" error message (r38872)
+  * fix failure to commit replacement of a directory (issue #3281)
+  * fix mod_dav_svn parent dir links to preserve peg revisions (issue #3425)
+
+ Developer-visible changes:
+  * fix 2 failing tests in ruby bindings (r38886)
+  * do not require GNU grep for build (issue #3453)
+  * use '$SED' instead of 'sed' in build scripts (issue #3458)
+  * add svn.client.{log5,merge_peg3} to python bindings (r39635, -6, -7)
+  * include the time of a test run in tests.log (r39887)
+
+ 
 Version 1.6.5
 (21 Aug 2009, from /branches/1.6.x)
 http://svn.collab.net/repos/svn/tags/1.6.5
 
  User-visible changes:
-  * fix mod_dav_svn directory view links to preserve peg revisions (r38201)
+  * fix mod_dav_svn directory view links to preserve peg revisions (r38021)
   * do not error on Windows when ALLUSERPROFILE dir nonexistent (r38053, -5, -7)
   * properly escape lock comments over ra_neon (r38101, -2)
   * allow syncing copies of '/' over ra_neon and ra_serf (issue #3438)

=== modified file 'README.Debian-tarball'
--- README.Debian-tarball	2009-08-24 19:09:22 +0000
+++ README.Debian-tarball	2009-12-12 13:21:14 +0000
@@ -1,4 +1,4 @@
-This tarball is the same as official subversion-1.6.5.tar.gz,
+This tarball is the same as official subversion-1.6.6.tar.gz,
 except that several unlicensed or unclearly-licensed files were
 removed:
 
@@ -7,13 +7,9 @@
   contrib/client-side/diffwrap.bat
   contrib/client-side/svn-log.pl
   contrib/client-side/svn_all_diffs.pl
-  contrib/client-side/svn_load_dirs
   contrib/client-side/vim
   contrib/hook-scripts/detect-merge-conflicts.sh
   contrib/server-side/backup-recipe.sh
   contrib/server-side/load_repo_with_mergesensitive_copy.sh
 
-and 'configure.ac' at the top level was edited to remove references to
-svn_load_dirs.pl.
-
-Peter Samuelson, 20 Aug 2009
+Peter Samuelson, 17 Oct 2009

=== modified file 'build-outputs.mk'
--- build-outputs.mk	2009-08-24 19:09:22 +0000
+++ build-outputs.mk	2009-12-12 13:21:15 +0000
@@ -1598,7 +1598,7 @@
 
 subversion/libsvn_client/log.lo: subversion/libsvn_client/log.c subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
-subversion/libsvn_client/merge.lo: subversion/libsvn_client/merge.c subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
+subversion/libsvn_client/merge.lo: subversion/libsvn_client/merge.c subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
 
 subversion/libsvn_client/mergeinfo.lo: subversion/libsvn_client/mergeinfo.c subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
 

=== added file 'build/ac-macros/apr_memcache.m4'
--- build/ac-macros/apr_memcache.m4	1970-01-01 00:00:00 +0000
+++ build/ac-macros/apr_memcache.m4	2009-12-12 13:21:15 +0000
@@ -0,0 +1,84 @@
+dnl
+dnl  SVN_LIB_APR_MEMCACHE
+dnl
+dnl  Check configure options and assign variables related to
+dnl  the apr_memcache client library.
+dnl  Sets svn_lib_apr_memcache to "yes" if memcache code is accessible
+dnl  either from the standalone apr_memcache library or from apr-util.
+dnl
+
+AC_DEFUN(SVN_LIB_APR_MEMCACHE,
+[
+  apr_memcache_found=no
+
+  AC_ARG_WITH(apr_memcache,AC_HELP_STRING([--with-apr_memcache=PREFIX],
+                                  [Standalone apr_memcache client library]),
+  [
+    if test "$withval" = "yes" ; then
+      AC_MSG_ERROR([--with-apr_memcache requires an argument.])
+    else
+      AC_MSG_NOTICE([looking for separate apr_memcache package])
+      apr_memcache_prefix=$withval
+      save_cppflags="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES -I$apr_memcache_prefix/include/apr_memcache-0"
+      AC_CHECK_HEADER(apr_memcache.h,[
+        save_ldflags="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -L$apr_memcache_prefix/lib"
+        AC_CHECK_LIB(apr_memcache, apr_memcache_create,
+          [apr_memcache_found="standalone"])
+        LDFLAGS="$save_ldflags"])
+      CPPFLAGS="$save_cppflags"
+    fi
+  ], [
+    if test -d "$srcdir/apr_memcache"; then
+      apr_memcache_found=reconfig
+    else
+dnl   Try just looking in apr-util (>= 1.3 has it already).
+      AC_MSG_NOTICE([looking for apr_memcache as part of apr-util])
+      save_cppflags="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES"
+      AC_CHECK_HEADER(apr_memcache.h,[
+        save_ldflags="$LDFLAGS"
+        LDFLAGS="$LDFLAGS $SVN_APRUTIL_EXPORT_LIBS"
+        AC_CHECK_LIB(aprutil-1, apr_memcache_create,
+          [apr_memcache_found="aprutil"])
+        LDFLAGS="$save_ldflags"])
+      CPPFLAGS="$save_cppflags"
+
+    fi
+   ])
+
+
+  if test $apr_memcache_found = "reconfig"; then
+    SVN_EXTERNAL_PROJECT([apr_memcache], [--with-apr=$apr_config --with-apr-util=$apu_config])
+    apr_memcache_prefix=$prefix
+    SVN_APR_MEMCACHE_PREFIX="$apr_memcache_prefix"
+    SVN_APR_MEMCACHE_INCLUDES="-I$srcdir/memcache"
+    SVN_APR_MEMCACHE_LIBS="$abs_builddir/memcache/libapr_memcache.la"
+    SVN_APR_MEMCACHE_EXPORT_LIBS="-L$apr_memcache_prefix/lib -lapr_memcache"
+  fi
+
+  if test $apr_memcache_found = "standalone"; then
+    SVN_APR_MEMCACHE_PREFIX="$apr_memcache_prefix"
+    SVN_APR_MEMCACHE_INCLUDES="-I$apr_memcache_prefix/include/apr_memcache-0"
+    SVN_APR_MEMCACHE_LIBS="$apr_memcache_prefix/lib/libapr_memcache.la"
+    SVN_APR_MEMCACHE_EXPORT_LIBS="-L$apr_memcache_prefix/lib -lapr_memcache"
+    svn_lib_apr_memcache=yes
+  elif test $apr_memcache_found = "aprutil"; then
+dnl We are already linking apr-util everywhere, so no special treatement needed.
+    SVN_APR_MEMCACHE_PREFIX=""
+    SVN_APR_MEMCACHE_INCLUDES=""
+    SVN_APR_MEMCACHE_LIBS=""
+    SVN_APR_MEMCACHE_EXPORT_LIBS=""
+    svn_lib_apr_memcache=yes
+  elif test $apr_memcache_found = "reconfig"; then
+    svn_lib_apr_memcache=yes
+  else
+    svn_lib_apr_memcache=no
+  fi
+
+  AC_SUBST(SVN_APR_MEMCACHE_PREFIX)
+  AC_SUBST(SVN_APR_MEMCACHE_INCLUDES)
+  AC_SUBST(SVN_APR_MEMCACHE_LIBS)
+  AC_SUBST(SVN_APR_MEMCACHE_EXPORT_LIBS)
+])

=== removed file 'build/ac-macros/apr_memcache.m4'
--- build/ac-macros/apr_memcache.m4	2009-04-09 17:30:40 +0000
+++ build/ac-macros/apr_memcache.m4	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-dnl
-dnl  SVN_LIB_APR_MEMCACHE
-dnl
-dnl  Check configure options and assign variables related to
-dnl  the apr_memcache client library.
-dnl  Sets svn_lib_apr_memcache to "yes" if memcache code is accessible
-dnl  either from the standalone apr_memcache library or from apr-util.
-dnl
-
-AC_DEFUN(SVN_LIB_APR_MEMCACHE,
-[
-  apr_memcache_found=no
-
-  AC_ARG_WITH(apr_memcache,AC_HELP_STRING([--with-apr_memcache=PREFIX],
-                                  [Standalone apr_memcache client library]),
-  [
-    if test "$withval" = "yes" ; then
-      AC_MSG_ERROR([--with-apr_memcache requires an argument.])
-    else
-      AC_MSG_NOTICE([looking for separate apr_memcache package])
-      apr_memcache_prefix=$withval
-      save_cppflags="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES -I$apr_memcache_prefix/include/apr_memcache-0"
-      AC_CHECK_HEADER(apr_memcache.h,[
-        save_ldflags="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -L$apr_memcache_prefix/lib"
-        AC_CHECK_LIB(apr_memcache, apr_memcache_create,
-          [apr_memcache_found="standalone"])
-        LDFLAGS="$save_ldflags"])
-      CPPFLAGS="$save_cppflags"
-    fi
-  ], [
-    if test -d "$srcdir/apr_memcache"; then
-      apr_memcache_found=reconfig
-    else
-dnl   Try just looking in apr-util (>= 1.3 has it already).
-      AC_MSG_NOTICE([looking for apr_memcache as part of apr-util])
-      save_cppflags="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES"
-      AC_CHECK_HEADER(apr_memcache.h,[
-        save_ldflags="$LDFLAGS"
-        LDFLAGS="$LDFLAGS $SVN_APRUTIL_EXPORT_LIBS"
-        AC_CHECK_LIB(aprutil-1, apr_memcache_create,
-          [apr_memcache_found="aprutil"])
-        LDFLAGS="$save_ldflags"])
-      CPPFLAGS="$save_cppflags"
-
-    fi
-   ])
-
-
-  if test $apr_memcache_found = "reconfig"; then
-    SVN_EXTERNAL_PROJECT([apr_memcache], [--with-apr=$apr_config --with-apr-util=$apu_config])
-    apr_memcache_prefix=$prefix
-    SVN_APR_MEMCACHE_PREFIX="$apr_memcache_prefix"
-    SVN_APR_MEMCACHE_INCLUDES="-I$srcdir/memcache"
-    SVN_APR_MEMCACHE_LIBS="$abs_builddir/memcache/libapr_memcache.la"
-    SVN_APR_MEMCACHE_EXPORT_LIBS="-L$apr_memcache_prefix/lib -lapr_memcache"
-  fi
-
-  if test $apr_memcache_found = "standalone"; then
-    SVN_APR_MEMCACHE_PREFIX="$apr_memcache_prefix"
-    SVN_APR_MEMCACHE_INCLUDES="-I$apr_memcache_prefix/include/apr_memcache-0"
-    SVN_APR_MEMCACHE_LIBS="$apr_memcache_prefix/lib/libapr_memcache.la"
-    SVN_APR_MEMCACHE_EXPORT_LIBS="-L$apr_memcache_prefix/lib -lapr_memcache"
-    svn_lib_apr_memcache=yes
-  elif test $apr_memcache_found = "aprutil"; then
-dnl We are already linking apr-util everywhere, so no special treatement needed.
-    SVN_APR_MEMCACHE_PREFIX=""
-    SVN_APR_MEMCACHE_INCLUDES=""
-    SVN_APR_MEMCACHE_LIBS=""
-    SVN_APR_MEMCACHE_EXPORT_LIBS=""
-    svn_lib_apr_memcache=yes
-  elif test $apr_memcache_found = "reconfig"; then
-    svn_lib_apr_memcache=yes
-  else
-    svn_lib_apr_memcache=no
-  fi
-
-  AC_SUBST(SVN_APR_MEMCACHE_PREFIX)
-  AC_SUBST(SVN_APR_MEMCACHE_INCLUDES)
-  AC_SUBST(SVN_APR_MEMCACHE_LIBS)
-  AC_SUBST(SVN_APR_MEMCACHE_EXPORT_LIBS)
-])

=== modified file 'build/ac-macros/berkeley-db.m4'
--- build/ac-macros/berkeley-db.m4	2009-08-24 19:09:22 +0000
+++ build/ac-macros/berkeley-db.m4	2009-12-12 13:21:15 +0000
@@ -63,17 +63,17 @@
       fi
     else
       if echo "$withval" | $EGREP ":.*:.*:" > /dev/null; then
-        svn_berkeley_db_header=["`echo "$withval" | sed -e "s/\([^:]*\):.*/\1/"`"]
+        svn_berkeley_db_header=["`echo "$withval" | $SED -e "s/\([^:]*\):.*/\1/"`"]
         SVN_DB_INCLUDES=""
-        for i in [`echo "$withval" | sed -e "s/.*:\([^:]*\):[^:]*:.*/\1/"`]; do
+        for i in [`echo "$withval" | $SED -e "s/.*:\([^:]*\):[^:]*:.*/\1/"`]; do
           SVN_DB_INCLUDES="$SVN_DB_INCLUDES -I$i"
         done
         SVN_DB_INCLUDES="${SVN_DB_INCLUDES## }"
-        for l in [`echo "$withval" | sed -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`]; do
+        for l in [`echo "$withval" | $SED -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`]; do
           LDFLAGS="$LDFLAGS -L$l"
         done
         SVN_DB_LIBS=""
-        for l in [`echo "$withval" | sed -e "s/.*:\([^:]*\)/\1/"`]; do
+        for l in [`echo "$withval" | $SED -e "s/.*:\([^:]*\)/\1/"`]; do
           SVN_DB_LIBS="$SVN_DB_LIBS -l$l"
         done
         SVN_DB_LIBS="${SVN_DB_LIBS## }"
@@ -161,7 +161,7 @@
     # Or that it resides in a non-standard location which we would have
     # to compensate with using something like -R`$apu_config --prefix`/lib.
     #
-    SVN_DB_LIBS=["${SVN_DB_LIBS-`$apu_config --libs | sed -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`}"]
+    SVN_DB_LIBS=["${SVN_DB_LIBS-`$apu_config --libs | $SED -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`}"]
 
     CPPFLAGS="$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES $CPPFLAGS" 
     LIBS="`$apu_config --ldflags` $SVN_DB_LIBS $LIBS"

=== added file 'build/ac-macros/ctypesgen.m4'
--- build/ac-macros/ctypesgen.m4	1970-01-01 00:00:00 +0000
+++ build/ac-macros/ctypesgen.m4	2009-12-12 13:21:15 +0000
@@ -0,0 +1,60 @@
+dnl
+dnl ctypesgen.m4: Locates ctypesgen for building/installing ctypes-python.
+dnl
+
+AC_DEFUN(SVN_CHECK_CTYPESGEN,
+[
+  AC_ARG_WITH(ctypesgen,
+              AS_HELP_STRING([--with-ctypesgen=PATH],
+                             [Specify the path to ctypesgen.  This can either
+                              be the full path to a ctypesgen installation,
+                              the full path to a ctypesgen source tree or the
+                              full path to ctypesgen.py.]),
+  [
+    case "$withval" in
+      "no")
+        SVN_FIND_CTYPESGEN(no)
+      ;;
+      "yes")
+        SVN_FIND_CTYPESGEN(check)
+      ;;
+      *)
+        SVN_FIND_CTYPESGEN($withval)
+      ;;
+    esac
+  ],
+  [
+    SVN_FIND_CTYPESGEN(check)
+  ])
+])
+
+AC_DEFUN(SVN_FIND_CTYPESGEN,
+[
+  where=$1
+
+  CTYPESGEN=none
+
+  if test $where = check; then
+    AC_PATH_PROG(CTYPESGEN, "ctypesgen.py", none)
+  elif test $where != no; then
+    AC_MSG_CHECKING([for ctypesgen.py])
+
+    if test -f "$where"; then
+      CTYPESGEN="$where"
+    elif test -f "$where/bin/ctypesgen.py"; then
+      CTYPESGEN="$where/bin/ctypesgen.py"
+    else
+      CTYPESGEN="$where/ctypesgen.py"
+    fi
+
+    if test ! -f "$CTYPESGEN" || test ! -x "$CTYPESGEN"; then
+      AC_MSG_ERROR([Could not find ctypesgen at $where/ctypesgen.py or at
+                    $where/bin/ctypesgen.py])
+    else
+      AC_MSG_RESULT([$CTYPESGEN])
+    fi
+  fi
+
+  dnl We use CTYPESGEN in the Makefile
+  AC_SUBST(CTYPESGEN)
+])

=== removed file 'build/ac-macros/ctypesgen.m4'
--- build/ac-macros/ctypesgen.m4	2009-04-09 17:30:40 +0000
+++ build/ac-macros/ctypesgen.m4	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-dnl
-dnl ctypesgen.m4: Locates ctypesgen for building/installing ctypes-python.
-dnl
-
-AC_DEFUN(SVN_CHECK_CTYPESGEN,
-[
-  AC_ARG_WITH(ctypesgen,
-              AS_HELP_STRING([--with-ctypesgen=PATH],
-                             [Specify the path to ctypesgen.  This can either
-                              be the full path to a ctypesgen installation,
-                              the full path to a ctypesgen source tree or the
-                              full path to ctypesgen.py.]),
-  [
-    case "$withval" in
-      "no")
-        SVN_FIND_CTYPESGEN(no)
-      ;;
-      "yes")
-        SVN_FIND_CTYPESGEN(check)
-      ;;
-      *)
-        SVN_FIND_CTYPESGEN($withval)
-      ;;
-    esac
-  ],
-  [
-    SVN_FIND_CTYPESGEN(check)
-  ])
-])
-
-AC_DEFUN(SVN_FIND_CTYPESGEN,
-[
-  where=$1
-
-  CTYPESGEN=none
-
-  if test $where = check; then
-    AC_PATH_PROG(CTYPESGEN, "ctypesgen.py", none)
-  elif test $where != no; then
-    AC_MSG_CHECKING([for ctypesgen.py])
-
-    if test -f "$where"; then
-      CTYPESGEN="$where"
-    elif test -f "$where/bin/ctypesgen.py"; then
-      CTYPESGEN="$where/bin/ctypesgen.py"
-    else
-      CTYPESGEN="$where/ctypesgen.py"
-    fi
-
-    if test ! -f "$CTYPESGEN" || test ! -x "$CTYPESGEN"; then
-      AC_MSG_ERROR([Could not find ctypesgen at $where/ctypesgen.py or at
-                    $where/bin/ctypesgen.py])
-    else
-      AC_MSG_RESULT([$CTYPESGEN])
-    fi
-  fi
-
-  dnl We use CTYPESGEN in the Makefile
-  AC_SUBST(CTYPESGEN)
-])

=== added file 'build/ac-macros/kwallet.m4'
--- build/ac-macros/kwallet.m4	1970-01-01 00:00:00 +0000
+++ build/ac-macros/kwallet.m4	2009-12-12 13:21:15 +0000
@@ -0,0 +1,99 @@
+dnl
+dnl  SVN_LIB_KWALLET
+dnl
+dnl  Check configure options and assign variables related to KWallet support
+dnl
+
+AC_DEFUN(SVN_LIB_KWALLET,
+[
+  AC_ARG_WITH(kwallet,
+    [AS_HELP_STRING([[--with-kwallet[=PATH]]],
+                    [Enable use of KWallet (KDE 4) for auth credentials])],
+                    [svn_lib_kwallet="$withval"],
+                    [svn_lib_kwallet=no])
+
+  AC_MSG_CHECKING([whether to look for KWallet])
+  if test "$svn_lib_kwallet" != "no"; then
+    AC_MSG_RESULT([yes])
+    if test "$enable_shared" = "yes"; then
+      if test "$APR_HAS_DSO" = "yes"; then
+        if test "$USE_NLS" = "yes"; then
+          if test -n "$PKG_CONFIG"; then
+            if test "$HAVE_DBUS" = "yes"; then
+              AC_MSG_CHECKING([for QtCore, QtDBus, QtGui])
+              if $PKG_CONFIG --exists QtCore QtDBus QtGui; then
+                AC_MSG_RESULT([yes])
+                if test "$svn_lib_kwallet" != "yes"; then
+                  AC_MSG_CHECKING([for kde4-config])
+                  kde4_config="$svn_lib_kwallet/bin/kde4-config"
+                  if test -f "$kde4_config" && test -x "$kde4_config"; then
+                    HAVE_KDE4_CONFIG="yes"
+                    AC_MSG_RESULT([yes])
+                  else
+                    AC_MSG_RESULT([no])
+                  fi
+                else
+                  AC_CHECK_PROG(HAVE_KDE4_CONFIG, kde4-config, yes)
+                  kde4_config="kde4-config"
+                fi
+                if test "$HAVE_KDE4_CONFIG" = "yes"; then
+                  AC_MSG_CHECKING([for KWallet])
+                  old_CXXFLAGS="$CXXFLAGS"
+                  old_LDFLAGS="$LDFLAGS"
+                  old_LIBS="$LIBS"
+                  for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do
+                    if test -n ["`echo "$d" | $GREP -- '^-D[^[:space:]]*'`"]; then
+                      CPPFLAGS="$CPPFLAGS $d"
+                    fi
+                  done
+                  qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
+                  kde_dir="`$kde4_config --prefix`"
+                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
+                  qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
+                  SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
+                  CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
+                  LIBS="$LIBS $SVN_KWALLET_LIBS"
+                  qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
+                  LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix`"
+                  AC_LANG(C++)
+                  AC_LINK_IFELSE([
+#include <kwallet.h>
+int main()
+{KWallet::Wallet::walletList();}], svn_lib_kwallet="yes", svn_lib_kwallet="no")
+                  AC_LANG(C)
+                  if test "$svn_lib_kwallet" = "yes"; then
+                    AC_MSG_RESULT([yes])
+                    CXXFLAGS="$old_CXXFLAGS"
+                    LIBS="$old_LIBS"
+                  else
+                    AC_MSG_RESULT([no])
+                    AC_MSG_ERROR([cannot find KWallet])
+                  fi
+                else
+                  AC_MSG_ERROR([cannot find kde4-config])
+                fi
+              else
+                AC_MSG_RESULT([no])
+                AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui])
+              fi
+            else
+              AC_MSG_ERROR([cannot find D-Bus])
+            fi
+          else
+            AC_MSG_ERROR([cannot find pkg-config])
+          fi
+        else
+          AC_MSG_ERROR([missing support for internationalization])
+        fi
+      else
+        AC_MSG_ERROR([APR does not have support for DSOs])
+      fi
+    else
+      AC_MSG_ERROR([--with-kwallet conflicts with --disable-shared])
+    fi
+  else
+    AC_MSG_RESULT([no])
+  fi
+  AC_SUBST(SVN_KWALLET_INCLUDES)
+  AC_SUBST(SVN_KWALLET_LIBS)
+])

=== removed file 'build/ac-macros/kwallet.m4'
--- build/ac-macros/kwallet.m4	2009-04-09 17:30:40 +0000
+++ build/ac-macros/kwallet.m4	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-dnl
-dnl  SVN_LIB_KWALLET
-dnl
-dnl  Check configure options and assign variables related to KWallet support
-dnl
-
-AC_DEFUN(SVN_LIB_KWALLET,
-[
-  AC_ARG_WITH(kwallet,
-    [AS_HELP_STRING([[--with-kwallet[=PATH]]],
-                    [Enable use of KWallet (KDE 4) for auth credentials])],
-                    [svn_lib_kwallet="$withval"],
-                    [svn_lib_kwallet=no])
-
-  AC_MSG_CHECKING([whether to look for KWallet])
-  if test "$svn_lib_kwallet" != "no"; then
-    AC_MSG_RESULT([yes])
-    if test "$enable_shared" = "yes"; then
-      if test "$APR_HAS_DSO" = "yes"; then
-        if test "$USE_NLS" = "yes"; then
-          if test -n "$PKG_CONFIG"; then
-            if test "$HAVE_DBUS" = "yes"; then
-              AC_MSG_CHECKING([for QtCore, QtDBus, QtGui])
-              if $PKG_CONFIG --exists QtCore QtDBus QtGui; then
-                AC_MSG_RESULT([yes])
-                if test "$svn_lib_kwallet" != "yes"; then
-                  AC_MSG_CHECKING([for kde4-config])
-                  kde4_config="$svn_lib_kwallet/bin/kde4-config"
-                  if test -f "$kde4_config" && test -x "$kde4_config"; then
-                    HAVE_KDE4_CONFIG="yes"
-                    AC_MSG_RESULT([yes])
-                  else
-                    AC_MSG_RESULT([no])
-                  fi
-                else
-                  AC_CHECK_PROG(HAVE_KDE4_CONFIG, kde4-config, yes)
-                  kde4_config="kde4-config"
-                fi
-                if test "$HAVE_KDE4_CONFIG" = "yes"; then
-                  AC_MSG_CHECKING([for KWallet])
-                  old_CXXFLAGS="$CXXFLAGS"
-                  old_LDFLAGS="$LDFLAGS"
-                  old_LIBS="$LIBS"
-                  for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui | $GREP -o -- -D[^[:space:]]*`]; do
-                    CPPFLAGS="$CPPFLAGS $d"
-                  done
-                  qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
-                  kde_dir="`$kde4_config --prefix`"
-                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
-                  qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
-                  SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
-                  CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
-                  LIBS="$LIBS $SVN_KWALLET_LIBS"
-                  qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
-                  LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix`"
-                  AC_LANG(C++)
-                  AC_LINK_IFELSE([
-#include <kwallet.h>
-int main()
-{KWallet::Wallet::walletList();}], svn_lib_kwallet="yes", svn_lib_kwallet="no")
-                  AC_LANG(C)
-                  if test "$svn_lib_kwallet" = "yes"; then
-                    AC_MSG_RESULT([yes])
-                    CXXFLAGS="$old_CXXFLAGS"
-                    LIBS="$old_LIBS"
-                  else
-                    AC_MSG_RESULT([no])
-                    AC_MSG_ERROR([cannot find KWallet])
-                  fi
-                else
-                  AC_MSG_ERROR([cannot find kde4-config])
-                fi
-              else
-                AC_MSG_RESULT([no])
-                AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui])
-              fi
-            else
-              AC_MSG_ERROR([cannot find D-Bus])
-            fi
-          else
-            AC_MSG_ERROR([cannot find pkg-config])
-          fi
-        else
-          AC_MSG_ERROR([missing support for internationalization])
-        fi
-      else
-        AC_MSG_ERROR([APR does not have support for DSOs])
-      fi
-    else
-      AC_MSG_ERROR([--with-kwallet conflicts with --disable-shared])
-    fi
-  else
-    AC_MSG_RESULT([no])
-  fi
-  AC_SUBST(SVN_KWALLET_INCLUDES)
-  AC_SUBST(SVN_KWALLET_LIBS)
-])

=== modified file 'build/ac-macros/neon.m4'
--- build/ac-macros/neon.m4	2009-06-09 23:53:06 +0000
+++ build/ac-macros/neon.m4	2009-12-12 13:21:15 +0000
@@ -141,7 +141,7 @@
       if test "$NEON_PKG_CONFIG" = "yes" ; then
         NEON_VERSION=`$PKG_CONFIG neon --modversion`
       else
-        NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
+        NEON_VERSION=`$neon_config --version | $SED -e 's/^neon //'`
       fi
       AC_MSG_RESULT([$NEON_VERSION])
 
@@ -165,8 +165,8 @@
            test "$svn_allowed_neon" = "any"; then
             svn_allowed_neon_on_system="yes"
             if test "$NEON_PKG_CONFIG" = "yes"; then
-              SVN_NEON_INCLUDES=[`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`]
-              CFLAGS=["$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"]
+              SVN_NEON_INCLUDES=[`$PKG_CONFIG neon --cflags | $SED -e 's/-D[^ ]*//g'`]
+              CFLAGS=["$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/-I[^ ]*//g'`"]
               old_CFLAGS="$CFLAGS"
               old_LIBS="$LIBS"
               NEON_LIBS=`$PKG_CONFIG neon --libs`
@@ -186,8 +186,8 @@
               CFLAGS="$old_CFLAGS"
               LIBS="$old_LIBS"
             else
-              SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`]
-              CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"]
+              SVN_NEON_INCLUDES=[`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'`]
+              CFLAGS=["$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`"]
               NEON_LIBS=`$neon_config --libs`
             fi
             svn_lib_neon="yes"

=== added file 'build/ac-macros/sqlite.m4'
--- build/ac-macros/sqlite.m4	1970-01-01 00:00:00 +0000
+++ build/ac-macros/sqlite.m4	2009-12-12 13:21:15 +0000
@@ -0,0 +1,228 @@
+dnl   SVN_LIB_SQLITE(minimum_ver, recommended_ver, url)
+dnl
+dnl   Search for a suitable version of sqlite.  minimum_ver is a
+dnl   version string which is the lowest suitable version we can use.
+dnl   recommended_ver is the recommended version of sqlite, which is
+dnl   not necessarily the latest version released.  url is the URL of
+dnl   the recommended version of sqlite.
+dnl
+dnl   If a --with-sqlite=PREFIX option is passed, look for a suitable sqlite
+dnl   either installed under the directory PREFIX or as an amalgamation file
+dnl   at the path PREFIX.  In this case ignore any sqlite-amalgamation/ subdir
+dnl   within the source tree.
+dnl
+dnl   If no --with-sqlite option is passed, look first for
+dnl   sqlite-amalgamation/sqlite3.c which should be the amalgamated version of
+dnl   the source distribution.  If the amalgamation exists and is the wrong
+dnl   version, exit with a failure.  If no sqlite-amalgamation/ subdir is
+dnl   present, search for a sqlite installed on the system.
+dnl
+dnl   If the search for sqlite fails, set svn_lib_sqlite to no, otherwise set
+dnl   it to yes.
+
+AC_DEFUN(SVN_LIB_SQLITE,
+[
+  SQLITE_MINIMUM_VER="$1"
+  SQLITE_RECOMMENDED_VER="$2"
+  SQLITE_URL="$3"
+  SQLITE_PKGNAME="sqlite3"
+
+  SVN_SQLITE_MIN_VERNUM_PARSE
+
+  AC_MSG_NOTICE([checking sqlite library])
+
+  AC_ARG_WITH(sqlite,
+              AS_HELP_STRING([--with-sqlite=PREFIX],
+                          [Use installed SQLite library or amalgamation file.]),
+  [
+    if test "$withval" = "yes" ; then
+      AC_MSG_ERROR([--with-sqlite requires an argument.])
+    else
+      sqlite_dir="$withval"
+    fi
+
+    if test -d $sqlite_dir; then
+      dnl pointed at an sqlite installation
+      SVN_SQLITE_DIR_CONFIG($sqlite_dir)
+    else
+      dnl pointed at the amalgamation file
+      SVN_SQLITE_FILE_CONFIG($sqlite_dir)
+    fi
+
+    if test -z "$svn_lib_sqlite"; then
+      AC_MSG_WARN([no suitable sqlite found in $sqlite_dir])
+      SVN_DOWNLOAD_SQLITE
+    fi
+  ],
+  [
+    dnl see if the sqlite amalgamation exists in the source tree
+    SVN_SQLITE_FILE_CONFIG($abs_srcdir/sqlite-amalgamation/sqlite3.c)
+
+    if test -z "$svn_lib_sqlite"; then
+      dnl check the "standard" location of /usr
+      SVN_SQLITE_DIR_CONFIG()
+    fi
+
+    if test -z "$svn_lib_sqlite"; then
+      dnl no --with-sqlite switch, and no sqlite subdir, look in PATH
+      SVN_SQLITE_PKG_CONFIG
+    fi
+
+    if test -z "$svn_lib_sqlite"; then
+      SVN_DOWNLOAD_SQLITE
+    fi
+  ])
+
+  AC_SUBST(SVN_SQLITE_INCLUDES)
+  AC_SUBST(SVN_SQLITE_LIBS)
+])
+
+dnl SVN_SQLITE_PKG_CONFIG
+dnl
+dnl Look for sqlite in PATH using pkg-config.
+AC_DEFUN(SVN_SQLITE_PKG_CONFIG,
+[
+    if test -n "$PKG_CONFIG"; then
+      AC_MSG_CHECKING([sqlite library version (via pkg-config)])
+      sqlite_version=`$PKG_CONFIG $SQLITE_PKGNAME --modversion --silence-errors`
+
+      if test -n "$sqlite_version"; then
+        SVN_SQLITE_VERNUM_PARSE
+
+        if test "$sqlite_ver_num" -ge "$sqlite_min_ver_num"; then
+          AC_MSG_RESULT([$sqlite_version])
+          svn_lib_sqlite="yes"
+          SVN_SQLITE_INCLUDES="`$PKG_CONFIG $SQLITE_PKGNAME --cflags`"
+          SVN_SQLITE_LIBS="`$PKG_CONFIG $SQLITE_PKGNAME --libs`"
+        else
+          AC_MSG_RESULT([none or unsupported $sqlite_version])
+        fi
+      fi
+    fi
+
+    if test -z "$svn_lib_sqlite"; then
+      AC_MSG_RESULT(no)
+    fi
+])
+
+dnl SVN_SQLITE_DIR_CONFIG(sqlite_dir)
+dnl
+dnl Check to see if we've got an appropriate sqlite library at sqlite_dir.
+dnl If we don't, fail.
+AC_DEFUN(SVN_SQLITE_DIR_CONFIG,
+[
+  if test -z "$1"; then
+    sqlite_dir=""
+    sqlite_include="sqlite3.h"
+  else
+    sqlite_dir="$1"
+    sqlite_include="$1/include/sqlite3.h"
+  fi
+
+  save_CPPFLAGS="$CPPFLAGS"
+  save_LDFLAGS="$LDFLAGS"
+
+  if test ! -z "$1"; then
+    CPPFLAGS="$CPPFLAGS -I$sqlite_dir/include"
+    LDFLAGS="$LDFLAGS -L$sqlite_dir/lib"
+  fi
+
+  AC_CHECK_HEADER(sqlite3.h,
+    [
+      AC_MSG_CHECKING([sqlite library version (via header)])
+      AC_EGREP_CPP(SQLITE_VERSION_OKAY,[
+#include "$sqlite_include"
+#if SQLITE_VERSION_NUMBER >= $sqlite_min_ver_num
+SQLITE_VERSION_OKAY
+#endif],
+                  [AC_MSG_RESULT([okay])
+                   AC_CHECK_LIB(sqlite3, sqlite3_close, [
+                      svn_lib_sqlite="yes"
+                      if test -z "$sqlite_dir" -o ! -d "$sqlite_dir"; then
+                        SVN_SQLITE_LIBS="-lsqlite3"
+                      else
+                        SVN_SQLITE_INCLUDES="-I$sqlite_dir/include"
+                        SVN_SQLITE_LIBS="-L$sqlite_dir/lib -lsqlite3"
+                      fi
+                  ])], [AC_MSG_RESULT([unsupported SQLite version])])
+    ])
+
+  CPPFLAGS="$save_CPPFLAGS"
+  LDFLAGS="$save_LDFLAGS"
+])
+
+dnl SVN_SQLITE_FILE_CONFIG(sqlite_file)
+dnl
+dnl Check to see if we've got an appropriate sqlite amalgamation file
+dnl at sqlite_file.  If not, fail.
+AC_DEFUN(SVN_SQLITE_FILE_CONFIG,
+[
+  sqlite_amalg="$1"
+  if test ! -e $sqlite_amalg; then
+    echo "amalgamation not found at $sqlite_amalg"
+  else
+    AC_MSG_CHECKING([sqlite amalgamation file version])
+    AC_EGREP_CPP(SQLITE_VERSION_OKAY,[
+#include "$sqlite_amalg"
+#if SQLITE_VERSION_NUMBER >= $sqlite_min_ver_num
+SQLITE_VERSION_OKAY
+#endif],
+                 [AC_MSG_RESULT([amalgamation found and is okay])
+                  AC_DEFINE(SVN_SQLITE_INLINE, 1,
+                  [Defined if svn should use the amalgamated version of sqlite])
+                  SVN_SQLITE_INCLUDES="-I`dirname $sqlite_amalg`"
+                  svn_lib_sqlite="yes"],
+                 [AC_MSG_RESULT([unsupported amalgamation SQLite version])])
+  fi
+])
+
+dnl SVN_SQLITE_VERNUM_PARSE()
+dnl
+dnl Parse a x.y[.z] version string sqlite_version into a number sqlite_ver_num.
+AC_DEFUN(SVN_SQLITE_VERNUM_PARSE,
+[
+  sqlite_major=`expr $sqlite_version : '\([[0-9]]*\)'`
+  sqlite_minor=`expr $sqlite_version : '[[0-9]]*\.\([[0-9]]*\)'`
+  sqlite_micro=`expr $sqlite_version : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+  if test -z "$sqlite_micro"; then
+    sqlite_micro=0
+  fi
+  sqlite_ver_num=`expr $sqlite_major \* 1000000 \
+                    \+ $sqlite_minor \* 1000 \
+                    \+ $sqlite_micro`
+])
+
+dnl SVN_SQLITE_MIN_VERNUM_PARSE()
+dnl
+dnl Parse a x.y.z version string SQLITE_MINIMUM_VER into a number
+dnl sqlite_min_ver_num.
+AC_DEFUN(SVN_SQLITE_MIN_VERNUM_PARSE,
+[
+  sqlite_min_major=`expr $SQLITE_MINIMUM_VER : '\([[0-9]]*\)'`
+  sqlite_min_minor=`expr $SQLITE_MINIMUM_VER : '[[0-9]]*\.\([[0-9]]*\)'`
+  sqlite_min_micro=`expr $SQLITE_MINIMUM_VER : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+  sqlite_min_ver_num=`expr $sqlite_min_major \* 1000000 \
+                        \+ $sqlite_min_minor \* 1000 \
+                        \+ $sqlite_min_micro`
+])
+
+dnl SVN_DOWNLOAD_SQLITE()
+dnl no sqlite found, print out a message telling the user what to do
+AC_DEFUN(SVN_DOWNLOAD_SQLITE,
+[
+  echo ""
+  echo "An appropriate version of sqlite could not be found.  We recommmend"
+  echo "${SQLITE_RECOMMENDED_VER}, but require at least ${SQLITE_MINIMUM_VER}."
+  echo "Please either install a newer sqlite on this system"
+  echo ""
+  echo "or"
+  echo ""
+  echo "get the sqlite ${SQLITE_RECOMMENDED_VER} amalgamation from:"
+  echo "    ${SQLITE_URL}"
+  echo "unpack the archive using tar/gunzip and copy sqlite3.c from the"
+  echo "resulting directory to:"
+  echo "$abs_srcdir/sqlite-amalgamation/sqlite3.c"
+  echo "This file also ships as part of the subversion-deps distribution."
+  echo ""
+  AC_MSG_ERROR([Subversion requires SQLite])
+])

=== removed file 'build/ac-macros/sqlite.m4'
--- build/ac-macros/sqlite.m4	2009-04-09 17:30:40 +0000
+++ build/ac-macros/sqlite.m4	1970-01-01 00:00:00 +0000
@@ -1,228 +0,0 @@
-dnl   SVN_LIB_SQLITE(minimum_ver, recommended_ver, url)
-dnl
-dnl   Search for a suitable version of sqlite.  minimum_ver is a
-dnl   version string which is the lowest suitable version we can use.
-dnl   recommended_ver is the recommended version of sqlite, which is
-dnl   not necessarily the latest version released.  url is the URL of
-dnl   the recommended version of sqlite.
-dnl
-dnl   If a --with-sqlite=PREFIX option is passed, look for a suitable sqlite
-dnl   either installed under the directory PREFIX or as an amalgamation file
-dnl   at the path PREFIX.  In this case ignore any sqlite-amalgamation/ subdir
-dnl   within the source tree.
-dnl
-dnl   If no --with-sqlite option is passed, look first for
-dnl   sqlite-amalgamation/sqlite3.c which should be the amalgamated version of
-dnl   the source distribution.  If the amalgamation exists and is the wrong
-dnl   version, exit with a failure.  If no sqlite-amalgamation/ subdir is
-dnl   present, search for a sqlite installed on the system.
-dnl
-dnl   If the search for sqlite fails, set svn_lib_sqlite to no, otherwise set
-dnl   it to yes.
-
-AC_DEFUN(SVN_LIB_SQLITE,
-[
-  SQLITE_MINIMUM_VER="$1"
-  SQLITE_RECOMMENDED_VER="$2"
-  SQLITE_URL="$3"
-  SQLITE_PKGNAME="sqlite3"
-
-  SVN_SQLITE_MIN_VERNUM_PARSE
-
-  AC_MSG_NOTICE([checking sqlite library])
-
-  AC_ARG_WITH(sqlite,
-              AS_HELP_STRING([--with-sqlite=PREFIX],
-                          [Use installed SQLite library or amalgamation file.]),
-  [
-    if test "$withval" = "yes" ; then
-      AC_MSG_ERROR([--with-sqlite requires an argument.])
-    else
-      sqlite_dir="$withval"
-    fi
-
-    if test -d $sqlite_dir; then
-      dnl pointed at an sqlite installation
-      SVN_SQLITE_DIR_CONFIG($sqlite_dir)
-    else
-      dnl pointed at the amalgamation file
-      SVN_SQLITE_FILE_CONFIG($sqlite_dir)
-    fi
-
-    if test -z "$svn_lib_sqlite"; then
-      AC_MSG_WARN([no suitable sqlite found in $sqlite_dir])
-      SVN_DOWNLOAD_SQLITE
-    fi
-  ],
-  [
-    dnl see if the sqlite amalgamation exists in the source tree
-    SVN_SQLITE_FILE_CONFIG($abs_srcdir/sqlite-amalgamation/sqlite3.c)
-
-    if test -z "$svn_lib_sqlite"; then
-      dnl check the "standard" location of /usr
-      SVN_SQLITE_DIR_CONFIG()
-    fi
-
-    if test -z "$svn_lib_sqlite"; then
-      dnl no --with-sqlite switch, and no sqlite subdir, look in PATH
-      SVN_SQLITE_PKG_CONFIG
-    fi
-
-    if test -z "$svn_lib_sqlite"; then
-      SVN_DOWNLOAD_SQLITE
-    fi
-  ])
-
-  AC_SUBST(SVN_SQLITE_INCLUDES)
-  AC_SUBST(SVN_SQLITE_LIBS)
-])
-
-dnl SVN_SQLITE_PKG_CONFIG
-dnl
-dnl Look for sqlite in PATH using pkg-config.
-AC_DEFUN(SVN_SQLITE_PKG_CONFIG,
-[
-    if test -n "$PKG_CONFIG"; then
-      AC_MSG_CHECKING([sqlite library version (via pkg-config)])
-      sqlite_version=`$PKG_CONFIG $SQLITE_PKGNAME --modversion --silence-errors`
-
-      if test -n "$sqlite_version"; then
-        SVN_SQLITE_VERNUM_PARSE
-
-        if test "$sqlite_ver_num" -ge "$sqlite_min_ver_num"; then
-          AC_MSG_RESULT([$sqlite_version])
-          svn_lib_sqlite="yes"
-          SVN_SQLITE_INCLUDES="`$PKG_CONFIG $SQLITE_PKGNAME --cflags`"
-          SVN_SQLITE_LIBS="`$PKG_CONFIG $SQLITE_PKGNAME --libs`"
-        else
-          AC_MSG_RESULT([none or unsupported $sqlite_version])
-        fi
-      fi
-    fi
-
-    if test -z "$svn_lib_sqlite"; then
-      AC_MSG_RESULT(no)
-    fi
-])
-
-dnl SVN_SQLITE_DIR_CONFIG(sqlite_dir)
-dnl
-dnl Check to see if we've got an appropriate sqlite library at sqlite_dir.
-dnl If we don't, fail.
-AC_DEFUN(SVN_SQLITE_DIR_CONFIG,
-[
-  if test -z "$1"; then
-    sqlite_dir=""
-    sqlite_include="sqlite3.h"
-  else
-    sqlite_dir="$1"
-    sqlite_include="$1/include/sqlite3.h"
-  fi
-
-  save_CPPFLAGS="$CPPFLAGS"
-  save_LDFLAGS="$LDFLAGS"
-
-  if test ! -z "$1"; then
-    CPPFLAGS="$CPPFLAGS -I$sqlite_dir/include"
-    LDFLAGS="$LDFLAGS -L$sqlite_dir/lib"
-  fi
-
-  AC_CHECK_HEADER(sqlite3.h,
-    [
-      AC_MSG_CHECKING([sqlite library version (via header)])
-      AC_EGREP_CPP(SQLITE_VERSION_OKAY,[
-#include "$sqlite_include"
-#if SQLITE_VERSION_NUMBER >= $sqlite_min_ver_num
-SQLITE_VERSION_OKAY
-#endif],
-                  [AC_MSG_RESULT([okay])
-                   AC_CHECK_LIB(sqlite3, sqlite3_close, [
-                      svn_lib_sqlite="yes"
-                      if test -z "$sqlite_dir" -o ! -d "$sqlite_dir"; then
-                        SVN_SQLITE_LIBS="-lsqlite3"
-                      else
-                        SVN_SQLITE_INCLUDES="-I$sqlite_dir/include"
-                        SVN_SQLITE_LIBS="-L$sqlite_dir/lib -lsqlite3"
-                      fi
-                  ])], [AC_MSG_RESULT([unsupported SQLite version])])
-    ])
-
-  CPPFLAGS="$save_CPPFLAGS"
-  LDFLAGS="$save_LDFLAGS"
-])
-
-dnl SVN_SQLITE_FILE_CONFIG(sqlite_file)
-dnl
-dnl Check to see if we've got an appropriate sqlite amalgamation file
-dnl at sqlite_file.  If not, fail.
-AC_DEFUN(SVN_SQLITE_FILE_CONFIG,
-[
-  sqlite_amalg="$1"
-  if test ! -e $sqlite_amalg; then
-    echo "amalgamation not found at $sqlite_amalg"
-  else
-    AC_MSG_CHECKING([sqlite amalgamation file version])
-    AC_EGREP_CPP(SQLITE_VERSION_OKAY,[
-#include "$sqlite_amalg"
-#if SQLITE_VERSION_NUMBER >= $sqlite_min_ver_num
-SQLITE_VERSION_OKAY
-#endif],
-                 [AC_MSG_RESULT([amalgamation found and is okay])
-                  AC_DEFINE(SVN_SQLITE_INLINE, 1,
-                  [Defined if svn should use the amalgamated version of sqlite])
-                  SVN_SQLITE_INCLUDES="-I`dirname $sqlite_amalg`"
-                  svn_lib_sqlite="yes"],
-                 [AC_MSG_RESULT([unsupported amalgamation SQLite version])])
-  fi
-])
-
-dnl SVN_SQLITE_VERNUM_PARSE()
-dnl
-dnl Parse a x.y[.z] version string sqlite_version into a number sqlite_ver_num.
-AC_DEFUN(SVN_SQLITE_VERNUM_PARSE,
-[
-  sqlite_major=`expr $sqlite_version : '\([[0-9]]*\)'`
-  sqlite_minor=`expr $sqlite_version : '[[0-9]]*\.\([[0-9]]*\)'`
-  sqlite_micro=`expr $sqlite_version : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-  if test -z "$sqlite_micro"; then
-    sqlite_micro=0
-  fi
-  sqlite_ver_num=`expr $sqlite_major \* 1000000 \
-                    \+ $sqlite_minor \* 1000 \
-                    \+ $sqlite_micro`
-])
-
-dnl SVN_SQLITE_MIN_VERNUM_PARSE()
-dnl
-dnl Parse a x.y.z version string SQLITE_MINIMUM_VER into a number
-dnl sqlite_min_ver_num.
-AC_DEFUN(SVN_SQLITE_MIN_VERNUM_PARSE,
-[
-  sqlite_min_major=`expr $SQLITE_MINIMUM_VER : '\([[0-9]]*\)'`
-  sqlite_min_minor=`expr $SQLITE_MINIMUM_VER : '[[0-9]]*\.\([[0-9]]*\)'`
-  sqlite_min_micro=`expr $SQLITE_MINIMUM_VER : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-  sqlite_min_ver_num=`expr $sqlite_min_major \* 1000000 \
-                        \+ $sqlite_min_minor \* 1000 \
-                        \+ $sqlite_min_micro`
-])
-
-dnl SVN_DOWNLOAD_SQLITE()
-dnl no sqlite found, print out a message telling the user what to do
-AC_DEFUN(SVN_DOWNLOAD_SQLITE,
-[
-  echo ""
-  echo "An appropriate version of sqlite could not be found.  We recommmend"
-  echo "${SQLITE_RECOMMENDED_VER}, but require at least ${SQLITE_MINIMUM_VER}."
-  echo "Please either install a newer sqlite on this system"
-  echo ""
-  echo "or"
-  echo ""
-  echo "get the sqlite ${SQLITE_RECOMMENDED_VER} amalgamation from:"
-  echo "    ${SQLITE_URL}"
-  echo "unpack the archive using tar/gunzip and copy sqlite3.c from the"
-  echo "resulting directory to:"
-  echo "$abs_srcdir/sqlite-amalgamation/sqlite3.c"
-  echo "This file also ships as part of the subversion-deps distribution."
-  echo ""
-  AC_MSG_ERROR([Subversion requires SQLite])
-])

=== modified file 'build/ac-macros/svn-macros.m4'
--- build/ac-macros/svn-macros.m4	2009-06-06 22:57:04 +0000
+++ build/ac-macros/svn-macros.m4	2009-12-12 13:21:15 +0000
@@ -60,7 +60,7 @@
     cd $1
 
     # A "../" for each directory in /$config_subdirs.
-    ac_dots=[`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`]
+    ac_dots=[`echo $apr_config_subdirs| $SED -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`]
 
     # Make the cache file name correct relative to the subdirectory.
     case "$cache_file" in

=== modified file 'build/ac-macros/swig.m4'
--- build/ac-macros/swig.m4	2009-06-09 23:53:06 +0000
+++ build/ac-macros/swig.m4	2009-12-12 13:21:15 +0000
@@ -53,7 +53,7 @@
   if test "$SWIG" != "none"; then
     AC_MSG_CHECKING([swig version])
     SWIG_VERSION_RAW="`$SWIG -version 2>&1 | \
-                       sed -ne 's/^.*Version \(.*\)$/\1/p'`"
+                       $SED -ne 's/^.*Version \(.*\)$/\1/p'`"
     # We want the version as an integer so we can test against
     # which version we're using.  SWIG doesn't provide this
     # to us so we have to come up with it on our own. 
@@ -62,7 +62,7 @@
     # and the patch level is zero padded to three places.
     # e.g. 1.3.24 becomes 103024
     SWIG_VERSION="`echo \"$SWIG_VERSION_RAW\" | \
-                  sed -e 's/[[^0-9\.]].*$//' \
+                  $SED -e 's/[[^0-9\.]].*$//' \
                       -e 's/\.\([[0-9]]\)$/.0\1/' \
                       -e 's/\.\([[0-9]][[0-9]]\)$/.0\1/' \
                       -e 's/\.\([[0-9]]\)\./0\1/; s/\.//g;'`"
@@ -190,7 +190,7 @@
 
     AC_CACHE_CHECK([how to compile Ruby extensions], [svn_cv_ruby_compile],[
       # Ruby doesn't like '-ansi', so strip that out of CFLAGS
-      svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | sed -e "s/ -ansi//g"`"
+      svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | $SED -e "s/ -ansi//g"`"
     ])
     SWIG_RB_COMPILE="$svn_cv_ruby_compile"
 
@@ -210,7 +210,7 @@
     AC_MSG_CHECKING([for rb_errinfo])
     old_CFLAGS="$CFLAGS"
     old_LIBS="$LIBS"
-    CFLAGS="`echo $CFLAGS | sed -e "s/ -ansi//g"` $svn_cv_ruby_includes"
+    CFLAGS="`echo $CFLAGS | $SED -e "s/ -ansi//g"` $svn_cv_ruby_includes"
     LIBS="$SWIG_RB_LIBS"
     AC_LINK_IFELSE([
 #include <ruby.h>
@@ -239,7 +239,7 @@
     AC_MSG_CHECKING([where to install Ruby scripts])
     AC_CACHE_VAL([svn_cv_ruby_sitedir_libsuffix],[
       svn_cv_ruby_sitedir_libsuffix="`echo "$rbconfig_sitelibdir" | \
-                                        sed -e "s,^$rbconfig_sitedir,,"`"
+                                        $SED -e "s,^$rbconfig_sitedir,,"`"
     ])
     SWIG_RB_SITE_LIB_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_libsuffix}"
     AC_MSG_RESULT([$SWIG_RB_SITE_LIB_DIR])
@@ -247,7 +247,7 @@
     AC_MSG_CHECKING([where to install Ruby extensions])
     AC_CACHE_VAL([svn_cv_ruby_sitedir_archsuffix],[
       svn_cv_ruby_sitedir_archsuffix="`echo "$rbconfig_sitearchdir" | \
-                                        sed -e "s,^$rbconfig_sitedir,,"`"
+                                        $SED -e "s,^$rbconfig_sitedir,,"`"
     ])
     SWIG_RB_SITE_ARCH_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_archsuffix}"
     AC_MSG_RESULT([$SWIG_RB_SITE_ARCH_DIR])

=== modified file 'build/run_tests.py'
--- build/run_tests.py	2009-06-09 23:53:06 +0000
+++ build/run_tests.py	2009-12-12 13:21:15 +0000
@@ -16,6 +16,7 @@
 '''
 
 import os, sys
+import time
 
 import getopt
 try:
@@ -135,6 +136,7 @@
     self.log.write('START: %s\n' % progbase)
     self.log.flush()
 
+    start_time = time.time()
     if progbase[-3:] == '.py':
       progname = sys.executable
       cmdline = [quote(progname),
@@ -197,7 +199,14 @@
       print('FAILURE')
     else:
       print('success')
-    self.log.write('END: %s\n\n' % progbase)
+    elapsed_time = time.strftime('%H:%M:%S', 
+                   time.gmtime(time.time() - start_time))
+    if self.log:
+      self.log.write('END: %s\n' % progbase)
+      self.log.write('ELAPSED: %s %s\n\n' % (progbase, elapsed_time))
+    else:
+      print('END: %s\n' % progbase)
+      print('ELAPSED: %s %s\n' % (progbase, elapsed_time))
     return failed
 
   def _run_prog(self, progname, arglist):

=== added file 'build/transform_sql.py'
--- build/transform_sql.py	1970-01-01 00:00:00 +0000
+++ build/transform_sql.py	2009-12-12 13:21:15 +0000
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+#
+# transform_sql.py -- create a header file with the appropriate SQL variables
+# from an SQL file
+#
+
+
+import os
+import re
+import sys
+
+
+def usage_and_exit(msg):
+  if msg:
+    sys.stderr.write('%s\n\n' % msg)
+  sys.stderr.write(
+    'USAGE: %s SQLITE_FILE [OUTPUT_FILE]\n'
+    '  stdout will be used if OUTPUT_FILE is not provided.\n'
+    % os.path.basename(sys.argv[0]))
+  sys.stderr.flush()
+  sys.exit(1)
+
+
+def main(input, output, filename):
+  input = input.read()
+
+  var_name = re.sub('[-.]', '_', filename)
+
+  output.write(
+    '/* This file is automatically generated from %s.\n'
+    ' * Do not edit this file -- edit the source and rerun gen-make.py */\n'
+    '\n'
+    % (filename,))
+
+  output.write('#define %s \\\n' % var_name.upper())
+
+  regex = re.compile(r'/\*.*?\*/', re.MULTILINE|re.DOTALL)
+  input = regex.sub('', input)
+
+  for line in input.split('\n'):
+    line = line.replace('"', '\\"')
+
+    if line.strip():
+      # got something besides whitespace. write it out.
+      output.write('  "' + line + '"\\\n')
+
+  output.write('  ""\n')
+
+
+if __name__ == '__main__':
+  if len(sys.argv) < 2 or len(sys.argv) > 3:
+    usage_and_exit('Incorrect number of arguments')
+
+  # Note: we could use stdin, but then we'd have no var_name
+  input_file = open(sys.argv[1], 'r')
+
+  if len(sys.argv) > 2:
+    output_file = open(sys.argv[2], 'w')
+  else:
+    output_file = sys.stdout
+
+  main(input_file, output_file, os.path.basename(sys.argv[1]))

=== removed file 'build/transform_sql.py'
--- build/transform_sql.py	2009-04-09 17:30:40 +0000
+++ build/transform_sql.py	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-#!/usr/bin/env python
-#
-# transform_sql.py -- create a header file with the appropriate SQL variables
-# from an SQL file
-#
-
-
-import os
-import re
-import sys
-
-
-def usage_and_exit(msg):
-  if msg:
-    sys.stderr.write('%s\n\n' % msg)
-  sys.stderr.write(
-    'USAGE: %s SQLITE_FILE [OUTPUT_FILE]\n'
-    '  stdout will be used if OUTPUT_FILE is not provided.\n'
-    % os.path.basename(sys.argv[0]))
-  sys.stderr.flush()
-  sys.exit(1)
-
-
-def main(input, output, filename):
-  input = input.read()
-
-  var_name = re.sub('[-.]', '_', filename)
-
-  output.write(
-    '/* This file is automatically generated from %s.\n'
-    ' * Do not edit this file -- edit the source and rerun gen-make.py */\n'
-    '\n'
-    % (filename,))
-
-  output.write('#define %s \\\n' % var_name.upper())
-
-  regex = re.compile(r'/\*.*?\*/', re.MULTILINE|re.DOTALL)
-  input = regex.sub('', input)
-
-  for line in input.split('\n'):
-    line = line.replace('"', '\\"')
-
-    if line.strip():
-      # got something besides whitespace. write it out.
-      output.write('  "' + line + '"\\\n')
-
-  output.write('  ""\n')
-
-
-if __name__ == '__main__':
-  if len(sys.argv) < 2 or len(sys.argv) > 3:
-    usage_and_exit('Incorrect number of arguments')
-
-  # Note: we could use stdin, but then we'd have no var_name
-  input_file = open(sys.argv[1], 'r')
-
-  if len(sys.argv) > 2:
-    output_file = open(sys.argv[2], 'w')
-  else:
-    output_file = sys.stdout
-
-  main(input_file, output_file, os.path.basename(sys.argv[1]))

=== added file 'build/transform_sql.sh'
--- build/transform_sql.sh	1970-01-01 00:00:00 +0000
+++ build/transform_sql.sh	2009-12-12 13:21:15 +0000
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+varname=`basename $1 | tr "[a-z]" "[A-Z]" | tr "-" "_" | tr "." "_"`
+
+echo "/* This file is automatically generated from"
+echo " * $1"
+echo " * Do not edit it directly, but edit the source file and rerun 'make'"
+echo " */"
+echo
+echo "#define $varname \\"
+
+comment=false
+
+IFS="
+"
+while read line; do
+  line=`echo "$line" | sed -e 's/\/\*.*\*\///g' | sed -e 's/[ ]*$//g'`
+
+  if [ -z "$line" ]; then
+    continue
+  fi
+
+  if [ "$comment" = "false" ] && echo "$line" | fgrep '/*' >/dev/null; then
+    comment=true
+  fi
+
+  if [ "$comment" = "true" ] && echo "$line" | fgrep '*/' >/dev/null; then
+    comment=false
+    continue
+  fi
+
+  if [ "$comment" = "true" ]; then
+    continue
+  fi
+
+  line="`echo "$line" | sed -e 's/"/\\"/g'`"  #' hi, emacs syntax coloring!
+  if [ -n "$line" ]; then
+    echo "  \"$line \"\\"
+  fi
+done
+
+echo '  ""'

=== removed file 'build/transform_sql.sh'
--- build/transform_sql.sh	2009-04-09 17:30:40 +0000
+++ build/transform_sql.sh	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-varname=`basename $1 | tr "[a-z]" "[A-Z]" | tr "-" "_" | tr "." "_"`
-
-echo "/* This file is automatically generated from"
-echo " * $1"
-echo " * Do not edit it directly, but edit the source file and rerun 'make'"
-echo " */"
-echo
-echo "#define $varname \\"
-
-comment=false
-
-IFS="
-"
-while read line; do
-  line=`echo "$line" | sed -e 's/\/\*.*\*\///g' | sed -e 's/[ ]*$//g'`
-
-  if [ -z "$line" ]; then
-    continue
-  fi
-
-  if [ "$comment" = "false" ] && echo "$line" | fgrep '/*' >/dev/null; then
-    comment=true
-  fi
-
-  if [ "$comment" = "true" ] && echo "$line" | fgrep '*/' >/dev/null; then
-    comment=false
-    continue
-  fi
-
-  if [ "$comment" = "true" ]; then
-    continue
-  fi
-
-  line="`echo "$line" | sed -e 's/"/\\"/g'`"  #' hi, emacs syntax coloring!
-  if [ -n "$line" ]; then
-    echo "  \"$line \"\\"
-  fi
-done
-
-echo '  ""'

=== modified file 'configure'
--- configure	2009-08-24 19:09:22 +0000
+++ configure	2009-12-12 13:21:15 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for subversion 1.6.5.
+# Generated by GNU Autoconf 2.63 for subversion 1.6.6.
 #
 # Report bugs to <http://subversion.tigris.org/>.
 #
@@ -750,8 +750,8 @@
 # Identity of this package.
 PACKAGE_NAME='subversion'
 PACKAGE_TARNAME='subversion'
-PACKAGE_VERSION='1.6.5'
-PACKAGE_STRING='subversion 1.6.5'
+PACKAGE_VERSION='1.6.6'
+PACKAGE_STRING='subversion 1.6.6'
 PACKAGE_BUGREPORT='http://subversion.tigris.org/'
 
 ac_unique_file="subversion/include/svn_types.h"
@@ -874,7 +874,6 @@
 RANLIB
 AR
 ECHO
-SED
 SVN_BINDIR
 SVN_SQLITE_LIBS
 SVN_SQLITE_INCLUDES
@@ -923,6 +922,7 @@
 build_vendor
 build_cpu
 build
+SED
 CPP
 ac_ct_CXX
 CXXFLAGS
@@ -1588,7 +1588,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures subversion 1.6.5 to adapt to many kinds of systems.
+\`configure' configures subversion 1.6.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1654,7 +1654,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of subversion 1.6.5:";;
+     short | recursive ) echo "Configuration of subversion 1.6.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1840,7 +1840,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-subversion configure 1.6.5
+subversion configure 1.6.6
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1854,7 +1854,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by subversion $as_me 1.6.5, which was
+It was created by subversion $as_me 1.6.6, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2256,8 +2256,8 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: Configuring Subversion 1.6.5" >&5
-$as_echo "$as_me: Configuring Subversion 1.6.5" >&6;}
+{ $as_echo "$as_me:$LINENO: Configuring Subversion 1.6.6" >&5
+$as_echo "$as_me: Configuring Subversion 1.6.6" >&6;}
 
 abs_srcdir="`cd $srcdir && pwd`"
 
@@ -3843,6 +3843,80 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+# Look for a good sed
+# AC_PROG_SED was introduced in Autoconf 2.59b
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     $as_unset ac_script || ac_script=
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+
 # Grab target_cpu, so we can use it in the Solaris pkginfo file
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -4480,7 +4554,7 @@
     cd apr
 
     # A "../" for each directory in /$config_subdirs.
-    ac_dots=`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+    ac_dots=`echo $apr_config_subdirs| $SED -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
 
     # Make the cache file name correct relative to the subdirectory.
     case "$cache_file" in
@@ -4847,7 +4921,7 @@
     cd apr-util
 
     # A "../" for each directory in /$config_subdirs.
-    ac_dots=`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+    ac_dots=`echo $apr_config_subdirs| $SED -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
 
     # Make the cache file name correct relative to the subdirectory.
     case "$cache_file" in
@@ -5018,8 +5092,8 @@
 
 # Either a space-separated list of allowable Neon versions, or "any" to
 # mean allow anything.
-NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28"
-NEON_RECOMMENDED_VER=0.28.4
+NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29"
+NEON_RECOMMENDED_VER="0.29.0"
 NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz"
 # Check whether --enable-neon-version-check was given.
 if test "${enable_neon_version_check+set}" = set; then
@@ -5063,7 +5137,7 @@
       if test "$NEON_PKG_CONFIG" = "yes" ; then
         NEON_VERSION=`$PKG_CONFIG neon --modversion`
       else
-        NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
+        NEON_VERSION=`$neon_config --version | $SED -e 's/^neon //'`
       fi
       { $as_echo "$as_me:$LINENO: result: $NEON_VERSION" >&5
 $as_echo "$NEON_VERSION" >&6; }
@@ -5097,8 +5171,8 @@
            test "$svn_allowed_neon" = "any"; then
             svn_allowed_neon_on_system="yes"
             if test "$NEON_PKG_CONFIG" = "yes"; then
-              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`
-              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"
+              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | $SED -e 's/-D[^ ]*//g'`
+              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/-I[^ ]*//g'`"
               old_CFLAGS="$CFLAGS"
               old_LIBS="$LIBS"
               NEON_LIBS=`$PKG_CONFIG neon --libs`
@@ -5188,8 +5262,8 @@
               CFLAGS="$old_CFLAGS"
               LIBS="$old_LIBS"
             else
-              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
-              CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
+              SVN_NEON_INCLUDES=`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'`
+              CFLAGS="$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`"
               NEON_LIBS=`$neon_config --libs`
             fi
             svn_lib_neon="yes"
@@ -5413,7 +5487,7 @@
     cd neon
 
     # A "../" for each directory in /$config_subdirs.
-    ac_dots=`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+    ac_dots=`echo $apr_config_subdirs| $SED -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
 
     # Make the cache file name correct relative to the subdirectory.
     case "$cache_file" in
@@ -5544,7 +5618,7 @@
       if test "$NEON_PKG_CONFIG" = "yes" ; then
         NEON_VERSION=`$PKG_CONFIG neon --modversion`
       else
-        NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
+        NEON_VERSION=`$neon_config --version | $SED -e 's/^neon //'`
       fi
       { $as_echo "$as_me:$LINENO: result: $NEON_VERSION" >&5
 $as_echo "$NEON_VERSION" >&6; }
@@ -5578,8 +5652,8 @@
            test "$svn_allowed_neon" = "any"; then
             svn_allowed_neon_on_system="yes"
             if test "$NEON_PKG_CONFIG" = "yes"; then
-              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`
-              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"
+              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | $SED -e 's/-D[^ ]*//g'`
+              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/-I[^ ]*//g'`"
               old_CFLAGS="$CFLAGS"
               old_LIBS="$LIBS"
               NEON_LIBS=`$PKG_CONFIG neon --libs`
@@ -5669,8 +5743,8 @@
               CFLAGS="$old_CFLAGS"
               LIBS="$old_LIBS"
             else
-              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
-              CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
+              SVN_NEON_INCLUDES=`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'`
+              CFLAGS="$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`"
               NEON_LIBS=`$neon_config --libs`
             fi
             svn_lib_neon="yes"
@@ -6358,7 +6432,7 @@
     cd serf
 
     # A "../" for each directory in /$config_subdirs.
-    ac_dots=`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+    ac_dots=`echo $apr_config_subdirs| $SED -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
 
     # Make the cache file name correct relative to the subdirectory.
     case "$cache_file" in
@@ -6982,7 +7056,7 @@
     cd apr_memcache
 
     # A "../" for each directory in /$config_subdirs.
-    ac_dots=`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+    ac_dots=`echo $apr_config_subdirs| $SED -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
 
     # Make the cache file name correct relative to the subdirectory.
     case "$cache_file" in
@@ -8603,7 +8677,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8606 "configure"' > conftest.$ac_ext
+  echo '#line 8680 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10724,11 +10798,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10727: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10801: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10731: \$? = $ac_status" >&5
+   echo "$as_me:10805: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11014,11 +11088,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11017: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11091: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11021: \$? = $ac_status" >&5
+   echo "$as_me:11095: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11118,11 +11192,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11121: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11195: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11125: \$? = $ac_status" >&5
+   echo "$as_me:11199: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13518,7 +13592,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13521 "configure"
+#line 13595 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13618,7 +13692,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13621 "configure"
+#line 13695 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16031,11 +16105,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16034: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16108: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16038: \$? = $ac_status" >&5
+   echo "$as_me:16112: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16135,11 +16209,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16138: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16212: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16142: \$? = $ac_status" >&5
+   echo "$as_me:16216: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17718,11 +17792,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17721: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17795: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17725: \$? = $ac_status" >&5
+   echo "$as_me:17799: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17822,11 +17896,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17825: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17899: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17829: \$? = $ac_status" >&5
+   echo "$as_me:17903: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20041,11 +20115,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20044: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20118: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:20048: \$? = $ac_status" >&5
+   echo "$as_me:20122: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -20331,11 +20405,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20334: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20408: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:20338: \$? = $ac_status" >&5
+   echo "$as_me:20412: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -20435,11 +20509,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20438: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20512: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:20442: \$? = $ac_status" >&5
+   echo "$as_me:20516: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -23365,17 +23439,17 @@
       fi
     else
       if echo "$withval" | $EGREP ":.*:.*:" > /dev/null; then
-        svn_berkeley_db_header="`echo "$withval" | sed -e "s/\([^:]*\):.*/\1/"`"
+        svn_berkeley_db_header="`echo "$withval" | $SED -e "s/\([^:]*\):.*/\1/"`"
         SVN_DB_INCLUDES=""
-        for i in `echo "$withval" | sed -e "s/.*:\([^:]*\):[^:]*:.*/\1/"`; do
+        for i in `echo "$withval" | $SED -e "s/.*:\([^:]*\):[^:]*:.*/\1/"`; do
           SVN_DB_INCLUDES="$SVN_DB_INCLUDES -I$i"
         done
         SVN_DB_INCLUDES="${SVN_DB_INCLUDES## }"
-        for l in `echo "$withval" | sed -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`; do
+        for l in `echo "$withval" | $SED -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`; do
           LDFLAGS="$LDFLAGS -L$l"
         done
         SVN_DB_LIBS=""
-        for l in `echo "$withval" | sed -e "s/.*:\([^:]*\)/\1/"`; do
+        for l in `echo "$withval" | $SED -e "s/.*:\([^:]*\)/\1/"`; do
           SVN_DB_LIBS="$SVN_DB_LIBS -l$l"
         done
         SVN_DB_LIBS="${SVN_DB_LIBS## }"
@@ -23431,7 +23505,7 @@
     # Or that it resides in a non-standard location which we would have
     # to compensate with using something like -R`$apu_config --prefix`/lib.
     #
-    SVN_DB_LIBS="${SVN_DB_LIBS-`$apu_config --libs | sed -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`}"
+    SVN_DB_LIBS="${SVN_DB_LIBS-`$apu_config --libs | $SED -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`}"
 
     CPPFLAGS="$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES $CPPFLAGS"
     LIBS="`$apu_config --ldflags` $SVN_DB_LIBS $LIBS"
@@ -25391,8 +25465,10 @@
                   old_CXXFLAGS="$CXXFLAGS"
                   old_LDFLAGS="$LDFLAGS"
                   old_LIBS="$LIBS"
-                  for d in `$PKG_CONFIG --cflags QtCore QtDBus QtGui | $GREP -o -- -D[^[:space:]]*`; do
-                    CPPFLAGS="$CPPFLAGS $d"
+                  for d in `$PKG_CONFIG --cflags QtCore QtDBus QtGui`; do
+                    if test -n "`echo "$d" | $GREP -- '^-D[^[:space:]]*'`"; then
+                      CPPFLAGS="$CPPFLAGS $d"
+                    fi
                   done
                   qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
                   kde_dir="`$kde4_config --prefix`"
@@ -25527,7 +25603,7 @@
 
 if test "$svn_lib_berkeley_db" = "yes"; then
   BUILD_RULES="$BUILD_RULES bdb-lib bdb-test"
-  INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-fsmod-lib/install-fsmod-lib install-bdb-lib/'`"
+  INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-fsmod-lib/install-fsmod-lib install-bdb-lib/'`"
   INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-bdb-lib"
   BDB_TEST_DEPS="\$(BDB_TEST_DEPS)"
   BDB_TEST_PROGRAMS="\$(BDB_TEST_PROGRAMS)"
@@ -25535,25 +25611,25 @@
 
 if test "$svn_lib_neon" = "yes"; then
   BUILD_RULES="$BUILD_RULES neon-lib"
-  INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-ramod-lib/install-ramod-lib install-neon-lib/'`"
+  INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-ramod-lib/install-ramod-lib install-neon-lib/'`"
   INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-neon-lib"
 fi
 
 if test "$svn_lib_serf" = "yes"; then
   BUILD_RULES="$BUILD_RULES serf-lib"
-  INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-ramod-lib/install-ramod-lib install-serf-lib/'`"
+  INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-ramod-lib/install-ramod-lib install-serf-lib/'`"
   INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-serf-lib"
 fi
 
 if test "$svn_lib_kwallet" = "yes"; then
   BUILD_RULES="$BUILD_RULES kwallet-lib"
-  INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-lib/install-lib install-kwallet-lib/'`"
+  INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-lib/install-lib install-kwallet-lib/'`"
   INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-kwallet-lib"
 fi
 
 if test "$with_gnome_keyring" = "yes"; then
   BUILD_RULES="$BUILD_RULES gnome-keyring-lib"
-  INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-lib/install-lib install-gnome-keyring-lib/'`"
+  INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-lib/install-lib install-gnome-keyring-lib/'`"
   INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-gnome-keyring-lib"
 fi
 
@@ -26579,13 +26655,13 @@
 
 
 if test "$enable_debugging" = "yes" ; then
-      CFLAGS="`echo $CFLAGS' ' | sed -e 's/-O[^ ]* //g'`"
-  CXXFLAGS="`echo $CXXFLAGS' ' | sed -e 's/-O[^ ]* //g'`"
+      CFLAGS="`echo $CFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"
+  CXXFLAGS="`echo $CXXFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"
       CFLAGS="$CFLAGS -DSVN_DEBUG -DAP_DEBUG"
   CXXFLAGS="$CXXFLAGS -DSVN_DEBUG -DAP_DEBUG"
 elif test "$enable_debugging" = "no" ; then
-    CFLAGS="`echo $CFLAGS' ' | sed -e 's/-g[0-9] //g' | sed -e 's/-g//g'`"
-    CXXFLAGS="`echo $CXXFLAGS' ' | sed -e 's/-g[0-9] //g' | sed -e 's/-g//g'`"
+    CFLAGS="`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`"
+    CXXFLAGS="`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`"
         CFLAGS="$CFLAGS -DNDEBUG"
     CXXFLAGS="$CXXFLAGS -DNDEBUG"
 # elif test "$enable_debugging" = "maybe" ; then
@@ -27884,7 +27960,7 @@
     { $as_echo "$as_me:$LINENO: checking swig version" >&5
 $as_echo_n "checking swig version... " >&6; }
     SWIG_VERSION_RAW="`$SWIG -version 2>&1 | \
-                       sed -ne 's/^.*Version \(.*\)$/\1/p'`"
+                       $SED -ne 's/^.*Version \(.*\)$/\1/p'`"
     # We want the version as an integer so we can test against
     # which version we're using.  SWIG doesn't provide this
     # to us so we have to come up with it on our own.
@@ -27893,7 +27969,7 @@
     # and the patch level is zero padded to three places.
     # e.g. 1.3.24 becomes 103024
     SWIG_VERSION="`echo \"$SWIG_VERSION_RAW\" | \
-                  sed -e 's/[^0-9\.].*$//' \
+                  $SED -e 's/[^0-9\.].*$//' \
                       -e 's/\.\([0-9]\)$/.0\1/' \
                       -e 's/\.\([0-9][0-9]\)$/.0\1/' \
                       -e 's/\.\([0-9]\)\./0\1/; s/\.//g;'`"
@@ -28113,7 +28189,7 @@
 else
 
       # Ruby doesn't like '-ansi', so strip that out of CFLAGS
-      svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | sed -e "s/ -ansi//g"`"
+      svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | $SED -e "s/ -ansi//g"`"
 
 fi
 { $as_echo "$as_me:$LINENO: result: $svn_cv_ruby_compile" >&5
@@ -28153,7 +28229,7 @@
 $as_echo_n "checking for rb_errinfo... " >&6; }
     old_CFLAGS="$CFLAGS"
     old_LIBS="$LIBS"
-    CFLAGS="`echo $CFLAGS | sed -e "s/ -ansi//g"` $svn_cv_ruby_includes"
+    CFLAGS="`echo $CFLAGS | $SED -e "s/ -ansi//g"` $svn_cv_ruby_includes"
     LIBS="$SWIG_RB_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 
@@ -28232,7 +28308,7 @@
 else
 
       svn_cv_ruby_sitedir_libsuffix="`echo "$rbconfig_sitelibdir" | \
-                                        sed -e "s,^$rbconfig_sitedir,,"`"
+                                        $SED -e "s,^$rbconfig_sitedir,,"`"
 
 fi
 
@@ -28247,7 +28323,7 @@
 else
 
       svn_cv_ruby_sitedir_archsuffix="`echo "$rbconfig_sitearchdir" | \
-                                        sed -e "s,^$rbconfig_sitedir,,"`"
+                                        $SED -e "s,^$rbconfig_sitedir,,"`"
 
 fi
 
@@ -28397,7 +28473,7 @@
     { $as_echo "$as_me:$LINENO: checking swig version" >&5
 $as_echo_n "checking swig version... " >&6; }
     SWIG_VERSION_RAW="`$SWIG -version 2>&1 | \
-                       sed -ne 's/^.*Version \(.*\)$/\1/p'`"
+                       $SED -ne 's/^.*Version \(.*\)$/\1/p'`"
     # We want the version as an integer so we can test against
     # which version we're using.  SWIG doesn't provide this
     # to us so we have to come up with it on our own.
@@ -28406,7 +28482,7 @@
     # and the patch level is zero padded to three places.
     # e.g. 1.3.24 becomes 103024
     SWIG_VERSION="`echo \"$SWIG_VERSION_RAW\" | \
-                  sed -e 's/[^0-9\.].*$//' \
+                  $SED -e 's/[^0-9\.].*$//' \
                       -e 's/\.\([0-9]\)$/.0\1/' \
                       -e 's/\.\([0-9][0-9]\)$/.0\1/' \
                       -e 's/\.\([0-9]\)\./0\1/; s/\.//g;'`"
@@ -28626,7 +28702,7 @@
 else
 
       # Ruby doesn't like '-ansi', so strip that out of CFLAGS
-      svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | sed -e "s/ -ansi//g"`"
+      svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | $SED -e "s/ -ansi//g"`"
 
 fi
 { $as_echo "$as_me:$LINENO: result: $svn_cv_ruby_compile" >&5
@@ -28666,7 +28742,7 @@
 $as_echo_n "checking for rb_errinfo... " >&6; }
     old_CFLAGS="$CFLAGS"
     old_LIBS="$LIBS"
-    CFLAGS="`echo $CFLAGS | sed -e "s/ -ansi//g"` $svn_cv_ruby_includes"
+    CFLAGS="`echo $CFLAGS | $SED -e "s/ -ansi//g"` $svn_cv_ruby_includes"
     LIBS="$SWIG_RB_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 
@@ -28745,7 +28821,7 @@
 else
 
       svn_cv_ruby_sitedir_libsuffix="`echo "$rbconfig_sitelibdir" | \
-                                        sed -e "s,^$rbconfig_sitedir,,"`"
+                                        $SED -e "s,^$rbconfig_sitedir,,"`"
 
 fi
 
@@ -28760,7 +28836,7 @@
 else
 
       svn_cv_ruby_sitedir_archsuffix="`echo "$rbconfig_sitearchdir" | \
-                                        sed -e "s,^$rbconfig_sitedir,,"`"
+                                        $SED -e "s,^$rbconfig_sitedir,,"`"
 
 fi
 
@@ -28910,7 +28986,7 @@
     { $as_echo "$as_me:$LINENO: checking swig version" >&5
 $as_echo_n "checking swig version... " >&6; }
     SWIG_VERSION_RAW="`$SWIG -version 2>&1 | \
-                       sed -ne 's/^.*Version \(.*\)$/\1/p'`"
+                       $SED -ne 's/^.*Version \(.*\)$/\1/p'`"
     # We want the version as an integer so we can test against
     # which version we're using.  SWIG doesn't provide this
     # to us so we have to come up with it on our own.
@@ -28919,7 +28995,7 @@
     # and the patch level is zero padded to three places.
     # e.g. 1.3.24 becomes 103024
     SWIG_VERSION="`echo \"$SWIG_VERSION_RAW\" | \
-                  sed -e 's/[^0-9\.].*$//' \
+                  $SED -e 's/[^0-9\.].*$//' \
                       -e 's/\.\([0-9]\)$/.0\1/' \
                       -e 's/\.\([0-9][0-9]\)$/.0\1/' \
                       -e 's/\.\([0-9]\)\./0\1/; s/\.//g;'`"
@@ -29139,7 +29215,7 @@
 else
 
       # Ruby doesn't like '-ansi', so strip that out of CFLAGS
-      svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | sed -e "s/ -ansi//g"`"
+      svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | $SED -e "s/ -ansi//g"`"
 
 fi
 { $as_echo "$as_me:$LINENO: result: $svn_cv_ruby_compile" >&5
@@ -29179,7 +29255,7 @@
 $as_echo_n "checking for rb_errinfo... " >&6; }
     old_CFLAGS="$CFLAGS"
     old_LIBS="$LIBS"
-    CFLAGS="`echo $CFLAGS | sed -e "s/ -ansi//g"` $svn_cv_ruby_includes"
+    CFLAGS="`echo $CFLAGS | $SED -e "s/ -ansi//g"` $svn_cv_ruby_includes"
     LIBS="$SWIG_RB_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 
@@ -29258,7 +29334,7 @@
 else
 
       svn_cv_ruby_sitedir_libsuffix="`echo "$rbconfig_sitelibdir" | \
-                                        sed -e "s,^$rbconfig_sitedir,,"`"
+                                        $SED -e "s,^$rbconfig_sitedir,,"`"
 
 fi
 
@@ -29273,7 +29349,7 @@
 else
 
       svn_cv_ruby_sitedir_archsuffix="`echo "$rbconfig_sitearchdir" | \
-                                        sed -e "s,^$rbconfig_sitedir,,"`"
+                                        $SED -e "s,^$rbconfig_sitedir,,"`"
 
 fi
 
@@ -29426,7 +29502,7 @@
     { $as_echo "$as_me:$LINENO: checking swig version" >&5
 $as_echo_n "checking swig version... " >&6; }
     SWIG_VERSION_RAW="`$SWIG -version 2>&1 | \
-                       sed -ne 's/^.*Version \(.*\)$/\1/p'`"
+                       $SED -ne 's/^.*Version \(.*\)$/\1/p'`"
     # We want the version as an integer so we can test against
     # which version we're using.  SWIG doesn't provide this
     # to us so we have to come up with it on our own.
@@ -29435,7 +29511,7 @@
     # and the patch level is zero padded to three places.
     # e.g. 1.3.24 becomes 103024
     SWIG_VERSION="`echo \"$SWIG_VERSION_RAW\" | \
-                  sed -e 's/[^0-9\.].*$//' \
+                  $SED -e 's/[^0-9\.].*$//' \
                       -e 's/\.\([0-9]\)$/.0\1/' \
                       -e 's/\.\([0-9][0-9]\)$/.0\1/' \
                       -e 's/\.\([0-9]\)\./0\1/; s/\.//g;'`"
@@ -29655,7 +29731,7 @@
 else
 
       # Ruby doesn't like '-ansi', so strip that out of CFLAGS
-      svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | sed -e "s/ -ansi//g"`"
+      svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | $SED -e "s/ -ansi//g"`"
 
 fi
 { $as_echo "$as_me:$LINENO: result: $svn_cv_ruby_compile" >&5
@@ -29695,7 +29771,7 @@
 $as_echo_n "checking for rb_errinfo... " >&6; }
     old_CFLAGS="$CFLAGS"
     old_LIBS="$LIBS"
-    CFLAGS="`echo $CFLAGS | sed -e "s/ -ansi//g"` $svn_cv_ruby_includes"
+    CFLAGS="`echo $CFLAGS | $SED -e "s/ -ansi//g"` $svn_cv_ruby_includes"
     LIBS="$SWIG_RB_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 
@@ -29774,7 +29850,7 @@
 else
 
       svn_cv_ruby_sitedir_libsuffix="`echo "$rbconfig_sitelibdir" | \
-                                        sed -e "s,^$rbconfig_sitedir,,"`"
+                                        $SED -e "s,^$rbconfig_sitedir,,"`"
 
 fi
 
@@ -29789,7 +29865,7 @@
 else
 
       svn_cv_ruby_sitedir_archsuffix="`echo "$rbconfig_sitearchdir" | \
-                                        sed -e "s,^$rbconfig_sitedir,,"`"
+                                        $SED -e "s,^$rbconfig_sitedir,,"`"
 
 fi
 
@@ -30372,6 +30448,8 @@
   ac_config_files="$ac_config_files tools/backup/hot-backup.py"
 
 
+  SVN_CONFIG_SCRIPT_FILES="$SVN_CONFIG_SCRIPT_FILES contrib/client-side/svn_load_dirs/svn_load_dirs.pl"
+  ac_config_files="$ac_config_files contrib/client-side/svn_load_dirs/svn_load_dirs.pl"
 
 
   SVN_CONFIG_SCRIPT_FILES="$SVN_CONFIG_SCRIPT_FILES contrib/client-side/svncopy/svncopy.pl"
@@ -30818,7 +30896,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by subversion $as_me 1.6.5, which was
+This file was extended by subversion $as_me 1.6.6, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -30881,7 +30959,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-subversion config.status 1.6.5
+subversion config.status 1.6.6
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -30992,7 +31070,8 @@
 #
 # INIT-COMMANDS
 #
-SVN_DB_HEADER="$SVN_DB_HEADER"
+SED="$SED"
+                    SVN_DB_HEADER="$SVN_DB_HEADER"
 
 _ACEOF
 
@@ -31006,6 +31085,7 @@
     "svn_private_config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS svn_private_config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "tools/backup/hot-backup.py") CONFIG_FILES="$CONFIG_FILES tools/backup/hot-backup.py" ;;
+    "contrib/client-side/svn_load_dirs/svn_load_dirs.pl") CONFIG_FILES="$CONFIG_FILES contrib/client-side/svn_load_dirs/svn_load_dirs.pl" ;;
     "contrib/client-side/svncopy/svncopy.pl") CONFIG_FILES="$CONFIG_FILES contrib/client-side/svncopy/svncopy.pl" ;;
     "contrib/client-side/svncopy/testsvncopy.pl") CONFIG_FILES="$CONFIG_FILES contrib/client-side/svncopy/testsvncopy.pl" ;;
     "contrib/hook-scripts/commit-email.pl") CONFIG_FILES="$CONFIG_FILES contrib/hook-scripts/commit-email.pl" ;;
@@ -31626,9 +31706,10 @@
 
 
   case $ac_file$ac_mode in
-    "svn_private_config.h":C) sed -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" subversion/svn_private_config.h > subversion/svn_private_config.h.new
+    "svn_private_config.h":C) $SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" subversion/svn_private_config.h > subversion/svn_private_config.h.new
                     mv -f subversion/svn_private_config.h.new subversion/svn_private_config.h ;;
     "tools/backup/hot-backup.py":F) chmod +x tools/backup/hot-backup.py ;;
+    "contrib/client-side/svn_load_dirs/svn_load_dirs.pl":F) chmod +x contrib/client-side/svn_load_dirs/svn_load_dirs.pl ;;
     "contrib/client-side/svncopy/svncopy.pl":F) chmod +x contrib/client-side/svncopy/svncopy.pl ;;
     "contrib/client-side/svncopy/testsvncopy.pl":F) chmod +x contrib/client-side/svncopy/testsvncopy.pl ;;
     "contrib/hook-scripts/commit-email.pl":F) chmod +x contrib/hook-scripts/commit-email.pl ;;

=== modified file 'configure.ac'
--- configure.ac	2009-08-24 19:09:22 +0000
+++ configure.ac	2009-12-12 13:21:14 +0000
@@ -40,6 +40,10 @@
 # Look for a C pre-processor
 AC_PROG_CPP
 
+# Look for a good sed
+# AC_PROG_SED was introduced in Autoconf 2.59b
+m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [SED="${SED:-sed}"])
+
 # Grab target_cpu, so we can use it in the Solaris pkginfo file
 AC_CANONICAL_TARGET
 
@@ -79,8 +83,8 @@
 
 # Either a space-separated list of allowable Neon versions, or "any" to
 # mean allow anything.
-NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28"
-NEON_RECOMMENDED_VER=0.28.4
+NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29"
+NEON_RECOMMENDED_VER="0.29.0"
 NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz"
 dnl You can skip the neon version check only if you know what you are doing 
 AC_ARG_ENABLE(neon-version-check,
@@ -532,7 +536,7 @@
 
 if test "$svn_lib_berkeley_db" = "yes"; then
   BUILD_RULES="$BUILD_RULES bdb-lib bdb-test"
-  INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-fsmod-lib/install-fsmod-lib install-bdb-lib/'`"
+  INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-fsmod-lib/install-fsmod-lib install-bdb-lib/'`"
   INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-bdb-lib"
   BDB_TEST_DEPS="\$(BDB_TEST_DEPS)"
   BDB_TEST_PROGRAMS="\$(BDB_TEST_PROGRAMS)"
@@ -540,25 +544,25 @@
   
 if test "$svn_lib_neon" = "yes"; then
   BUILD_RULES="$BUILD_RULES neon-lib"
-  INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-ramod-lib/install-ramod-lib install-neon-lib/'`"
+  INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-ramod-lib/install-ramod-lib install-neon-lib/'`"
   INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-neon-lib"
 fi
 
 if test "$svn_lib_serf" = "yes"; then
   BUILD_RULES="$BUILD_RULES serf-lib"
-  INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-ramod-lib/install-ramod-lib install-serf-lib/'`"
+  INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-ramod-lib/install-ramod-lib install-serf-lib/'`"
   INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-serf-lib"
 fi
 
 if test "$svn_lib_kwallet" = "yes"; then
   BUILD_RULES="$BUILD_RULES kwallet-lib"
-  INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-lib/install-lib install-kwallet-lib/'`"
+  INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-lib/install-lib install-kwallet-lib/'`"
   INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-kwallet-lib"
 fi
 
 if test "$with_gnome_keyring" = "yes"; then
   BUILD_RULES="$BUILD_RULES gnome-keyring-lib"
-  INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-lib/install-lib install-gnome-keyring-lib/'`"
+  INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-lib/install-lib install-gnome-keyring-lib/'`"
   INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-gnome-keyring-lib"
 fi
 
@@ -683,15 +687,15 @@
 if test "$enable_debugging" = "yes" ; then
   dnl At the moment, we don't want optimization, because we're
   dnl debugging.
-  CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-O[^ ]* //g'`"]
-  CXXFLAGS=["`echo $CXXFLAGS' ' | sed -e 's/-O[^ ]* //g'`"]
+  CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
+  CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
   dnl SVN_DEBUG enables specific features for developer builds
   dnl AP_DEBUG enables specific (Apache) features for developer builds
   CFLAGS="$CFLAGS -DSVN_DEBUG -DAP_DEBUG"
   CXXFLAGS="$CXXFLAGS -DSVN_DEBUG -DAP_DEBUG"
 elif test "$enable_debugging" = "no" ; then
-    CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-g[0-9] //g' | sed -e 's/-g//g'`"]
-    CXXFLAGS=["`echo $CXXFLAGS' ' | sed -e 's/-g[0-9] //g' | sed -e 's/-g//g'`"]
+    CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`"]
+    CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`"]
     dnl Compile with NDEBUG to get rid of assertions
     CFLAGS="$CFLAGS -DNDEBUG"
     CXXFLAGS="$CXXFLAGS -DNDEBUG"
@@ -989,12 +993,14 @@
 
 AC_CONFIG_HEADERS(subversion/svn_private_config.h)
 AC_CONFIG_COMMANDS([svn_private_config.h],
-                   [sed -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" subversion/svn_private_config.h > subversion/svn_private_config.h.new
+                   [$SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" subversion/svn_private_config.h > subversion/svn_private_config.h.new
                     mv -f subversion/svn_private_config.h.new subversion/svn_private_config.h],
-                   [SVN_DB_HEADER="$SVN_DB_HEADER"])
+                   [SED="$SED"
+                    SVN_DB_HEADER="$SVN_DB_HEADER"])
 AC_CONFIG_FILES([Makefile])
 
 SVN_CONFIG_SCRIPT(tools/backup/hot-backup.py)
+SVN_CONFIG_SCRIPT(contrib/client-side/svn_load_dirs/svn_load_dirs.pl)
 SVN_CONFIG_SCRIPT(contrib/client-side/svncopy/svncopy.pl)
 SVN_CONFIG_SCRIPT(contrib/client-side/svncopy/testsvncopy.pl)
 SVN_CONFIG_SCRIPT(contrib/hook-scripts/commit-email.pl)

=== added directory 'contrib/client-side/svn_load_dirs'
=== added file 'contrib/client-side/svn_load_dirs/LICENSE_AFL3.txt'
--- contrib/client-side/svn_load_dirs/LICENSE_AFL3.txt	1970-01-01 00:00:00 +0000
+++ contrib/client-side/svn_load_dirs/LICENSE_AFL3.txt	2009-12-12 13:21:15 +0000
@@ -0,0 +1,190 @@
+http://www.opensource.org/licenses/academic.php
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original
+work of authorship (the "Original Work") whose owner (the "Licensor")
+has placed the following licensing notice adjacent to the copyright
+notice for the Original Work:
+
+    Licensed under the Academic Free License version 3.0
+
+ 1) Grant of Copyright License. Licensor grants You a worldwide,
+    royalty-free, non-exclusive, sublicensable license, for the
+    duration of the copyright, to do the following:
+    a) to reproduce the Original Work in copies, either alone or as
+       part of a collective work;
+    b) to translate, adapt, alter, transform, modify, or arrange the
+       Original Work, thereby creating derivative works ("Derivative
+       Works") based upon the Original Work;
+    c) to distribute or communicate copies of the Original Work and
+       Derivative Works to the public, under any license of your
+       choice that does not contradict the terms and conditions,
+       including Licensor's reserved rights and remedies, in this
+       Academic Free License;
+    d) to perform the Original Work publicly; and
+    e) to display the Original Work publicly.
+
+ 2) Grant of Patent License. Licensor grants You a worldwide,
+    royalty-free, non- exclusive, sublicensable license, under patent
+    claims owned or controlled by the Licensor that are embodied in
+    the Original Work as furnished by the Licensor, for the duration
+    of the patents, to make, use, sell, offer for sale, have made, and
+    import the Original Work and Derivative Works.
+
+ 3) Grant of Source Code License. The term "Source Code" means the
+    preferred form of the Original Work for making modifications to it
+    and all available documentation describing how to modify the
+    Original Work. Licensor agrees to provide a machine-readable copy
+    of the Source Code of the Original Work along with each copy of
+    the Original Work that Licensor distributes. Licensor reserves the
+    right to satisfy this obligation by placing a machine-readable
+    copy of the Source Code in an information repository reasonably
+    calculated to permit inexpensive and convenient access by You for
+    as long as Licensor continues to distribute the Original Work.
+
+ 4) Exclusions From License Grant. Neither the names of Licensor, nor
+    the names of any contributors to the Original Work, nor any of
+    their trademarks or service marks, may be used to endorse or
+    promote products derived from this Original Work without express
+    prior permission of the Licensor. Except as expressly stated
+    herein, nothing in this License grants any license to Licensor's
+    trademarks, copyrights, patents, trade secrets or any other
+    intellectual property. No patent license is granted to make, use,
+    sell, offer for sale, have made, or import embodiments of any
+    patent claims other than the licensed claims defined in Section
+    2. No license is granted to the trademarks of Licensor even if
+    such marks are included in the Original Work. Nothing in this
+    License shall be interpreted to prohibit Licensor from licensing
+    under terms different from this License any Original Work that
+    Licensor otherwise would have a right to license.
+
+ 5) External Deployment. The term "External Deployment" means the use,
+    distribution, or communication of the Original Work or Derivative
+    Works in any way such that the Original Work or Derivative Works
+    may be used by anyone other than You, whether those works are
+    distributed or communicated to those persons or made available as
+    an application intended for use over a network. As an express
+    condition for the grants of license hereunder, You must treat any
+    External Deployment by You of the Original Work or a Derivative
+    Work as a distribution under section 1(c).
+
+ 6) Attribution Rights. You must retain, in the Source Code of any
+    Derivative Works that You create, all copyright, patent, or
+    trademark notices from the Source Code of the Original Work, as
+    well as any notices of licensing and any descriptive text
+    identified therein as an "Attribution Notice." You must cause the
+    Source Code for any Derivative Works that You create to carry a
+    prominent Attribution Notice reasonably calculated to inform
+    recipients that You have modified the Original Work.
+
+ 7) Warranty of Provenance and Disclaimer of Warranty. Licensor
+    warrants that the copyright in and to the Original Work and the
+    patent rights granted herein by Licensor are owned by the Licensor
+    or are sublicensed to You under the terms of this License with the
+    permission of the contributor(s) of those copyrights and patent
+    rights. Except as expressly stated in the immediately preceding
+    sentence, the Original Work is provided under this License on an
+    "AS IS" BASIS and WITHOUT WARRANTY, either express or implied,
+    including, without limitation, the warranties of non-infringement,
+    merchantability or fitness for a particular purpose. THE ENTIRE
+    RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.  This
+    DISCLAIMER OF WARRANTY constitutes an essential part of this
+    License. No license to the Original Work is granted by this
+    License except under this disclaimer.
+
+ 8) Limitation of Liability. Under no circumstances and under no legal
+    theory, whether in tort (including negligence), contract, or
+    otherwise, shall the Licensor be liable to anyone for any
+    indirect, special, incidental, or consequential damages of any
+    character arising as a result of this License or the use of the
+    Original Work including, without limitation, damages for loss of
+    goodwill, work stoppage, computer failure or malfunction, or any
+    and all other commercial damages or losses. This limitation of
+    liability shall not apply to the extent applicable law prohibits
+    such limitation.
+
+ 9) Acceptance and Termination. If, at any time, You expressly
+    assented to this License, that assent indicates your clear and
+    irrevocable acceptance of this License and all of its terms and
+    conditions. If You distribute or communicate copies of the
+    Original Work or a Derivative Work, You must make a reasonable
+    effort under the circumstances to obtain the express assent of
+    recipients to the terms of this License. This License conditions
+    your rights to undertake the activities listed in Section 1,
+    including your right to create Derivative Works based upon the
+    Original Work, and doing so without honoring these terms and
+    conditions is prohibited by copyright law and international
+    treaty. Nothing in this License is intended to affect copyright
+    exceptions and limitations (including "fair use" or "fair
+    dealing"). This License shall terminate immediately and You may no
+    longer exercise any of the rights granted to You by this License
+    upon your failure to honor the conditions in Section 1(c).
+
+10) Termination for Patent Action. This License shall terminate
+    automatically and You may no longer exercise any of the rights
+    granted to You by this License as of the date You commence an
+    action, including a cross-claim or counterclaim, against Licensor
+    or any licensee alleging that the Original Work infringes a
+    patent. This termination provision shall not apply for an action
+    alleging patent infringement by combinations of the Original Work
+    with other software or hardware.
+
+11) Jurisdiction, Venue and Governing Law. Any action or suit relating
+    to this License may be brought only in the courts of a
+    jurisdiction wherein the Licensor resides or in which Licensor
+    conducts its primary business, and under the laws of that
+    jurisdiction excluding its conflict-of-law provisions. The
+    application of the United Nations Convention on Contracts for the
+    International Sale of Goods is expressly excluded. Any use of the
+    Original Work outside the scope of this License or after its
+    termination shall be subject to the requirements and penalties of
+    copyright or patent law in the appropriate jurisdiction. This
+    section shall survive the termination of this License.
+
+12) Attorneys' Fees. In any action to enforce the terms of this
+    License or seeking damages relating thereto, the prevailing party
+    shall be entitled to recover its costs and expenses, including,
+    without limitation, reasonable attorneys' fees and costs incurred
+    in connection with such action, including any appeal of such
+    action. This section shall survive the termination of this
+    License.
+
+13) Miscellaneous. If any provision of this License is held to be
+    unenforceable, such provision shall be reformed only to the extent
+    necessary to make it enforceable.
+
+14) Definition of "You" in This License. "You" throughout this
+    License, whether in upper or lower case, means an individual or a
+    legal entity exercising rights under, and complying with all of
+    the terms of, this License. For legal entities, "You" includes any
+    entity that controls, is controlled by, or is under common control
+    with you. For purposes of this definition, "control" means (i) the
+    power, direct or indirect, to cause the direction or management of
+    such entity, whether by contract or otherwise, or (ii) ownership
+    of fifty percent (50%) or more of the outstanding shares, or (iii)
+    beneficial ownership of such entity.
+
+15) Right to Use. You may use the Original Work in all ways not
+    otherwise restricted or conditioned by this License or by law, and
+    Licensor promises not to interfere with or be responsible for such
+    uses by You.
+
+16) Modification of This License. This License is Copyright © 2005
+    Lawrence Rosen. Permission is granted to copy, distribute, or
+    communicate this License without modification. Nothing in this
+    License permits You to modify this License as applied to the
+    Original Work or to Derivative Works. However, You may modify the
+    text of this License and copy, distribute or communicate your
+    modified version (the "Modified License") and apply it to other
+    original works of authorship subject to the following conditions:
+    (i) You may not indicate in any way that your Modified License is
+    the "Academic Free License" or "AFL" and you may not use those
+    names in the name of your Modified License; (ii) You must replace
+    the notice specified in the first paragraph above with the notice
+    "Licensed under <insert your license name here>" or with a notice
+    of your own that is not confusingly similar to the notice in this
+    License; and (iii) You may not claim that your original works are
+    open source software unless your Modified License has been
+    approved by Open Source Initiative (OSI) and You comply with its
+    license review and certification process.

=== added file 'contrib/client-side/svn_load_dirs/svn_load_dirs.README'
--- contrib/client-side/svn_load_dirs/svn_load_dirs.README	1970-01-01 00:00:00 +0000
+++ contrib/client-side/svn_load_dirs/svn_load_dirs.README	2009-12-12 13:21:14 +0000
@@ -0,0 +1,270 @@
+Introduction
+============
+
+This Perl script is designed to load a number of directories into
+Subversion.  This is useful if you have a number of .zip's or
+tar.{Z,gz,bz2}'s for a particular package and want to load them into
+Subversion.
+
+Command Line Options
+====================
+
+Run the script with no command line arguments to see all the command
+line options it takes.
+
+When Not To Use This Script
+===========================
+
+This script assumes that these packages were not previously in a
+source control system, in particular CVS, because then you would use
+another script to migrate the repository over, and in CVS' case, you
+would use cvs2svn.  This script will properly tag each release in the
+tags directory if you use the -t command line option.
+
+Automatically Setting Properties On New Files & Directories
+===========================================================
+
+The script also accepts a separate configuration file for applying
+properties to specific files and directories matching a regular
+expression that are *added* to the repository.  This script will not
+modify properties of already existing files or directories in the
+repository.  This configuration file is specified to svn_load_dirs.pl
+using the -p command line option.  The format of the file is either
+two or four columns:
+
+regular_expression  control  property_name  property_value
+
+   The `regular_expression' is a Perl style regular expression.  It is
+   matched in a case-insensitive against filenames.
+
+   The `control' must either be set to `break' or `cont'.  It is used
+   to tell svn_load_dirs.pl if the following lines in the
+   configuration file should be examined for a match or if all
+   matching should stop.  If `control' is set to `break', then no more
+   lines from the configuration file will be matched.  If `control' is
+   set to `cont', which is short for continue, then more comparisons
+   will be made.  Multiple properties can be set for one file or
+   directory this way.
+
+   The last two, `property_name' and `property_value' are optional and
+   are applied to matching files and directories.
+
+If you have whitespace in any of the `regular_expression',
+`property_name' or `property_value' columns, you must surround the
+value with either a single or double quote.  You can protect single or
+double quotes with a \ character.  The \ character is removed by this
+script *only* for whitespace and quote characters, so you do not need
+to protect any other characters, beyond what you would normally
+protect for the regular expression.
+
+This sample configuration file was used to load on a Unix box a number
+of Zip files containing Windows files with CRLF end of lines.
+
+   \.doc$              break   svn:mime-type   application/msword
+   \.ds(p|w)$          break   svn:eol-style   CRLF
+   \.ilk$              break   svn:eol-style   CRLF
+   \.ncb$              break   svn:eol-style   CRLF
+   \.opt$              break   svn:eol-style   CRLF
+   \.exe$              break   svn:mime-type   application/octet-stream
+   dos2unix-eol\.sh$   break
+   .*                  break   svn:eol-style   native
+
+In this example, all the files should be converted to the native end
+of line style, which the last line of the configuration handles.  The
+exception is dos2unix-eol.sh, which contains embedded CR's used to
+find and replace Windows CRLF end of line characters with Unix's LF
+characters.  Since svn and svn_load_dirs.pl converts all CR, CRLF and
+LF's to the native end of line style when `svn:eol-style' is set to
+`native', this file should be left untouched.  Hence, the `break' with
+no property settings.
+
+The Windows Visual C++ and Visual Studio files (*.dsp, *.dsw, etc.) 
+should retain their CRLF line endings on any operating system and any
+*.doc files are always treated as binary files, hence the
+`svn:mime-type' setting of `application/msword'.
+
+Example Import
+==============
+
+An example import follows:
+
+Steps:
+
+1) Unpack your .tar.{Z,gz,bz2}'s or .zips into a directory that is not
+   in a Subversion repository.
+
+   Example:
+
+   I'll use an example from my Orca distribution:
+
+      % cd /tmp
+      % zcat orca-0.18.tar.gz | tar xf -
+      % zcat orca-0.27b2.tar.gz | tar xf -
+
+2) Decide on the directory structure you want to use to contain the
+   project you are loading.
+
+   There are three main directory structures you can use.  If you have
+   a single project, then use the structure Subversion uses for
+   itself, that is
+
+      /branches
+      /tags
+      /trunk
+
+   and load the project into /trunk and the tags into the tags
+   directory.
+
+   If you have more than one project and you want to treat each
+   project separately, then use one of the following structures:
+
+      /branches
+      /tags
+      /tags/project1
+      /tags/project2
+      /tags/project3
+      /trunk
+      /trunk/project1
+      /trunk/project2
+      /trunk/project3
+
+   or
+
+      /project1/branches
+      /project1/tags
+      /project1/trunk
+      /project2/branches
+      /project2/tags
+      /project2/trunk
+
+   Example:
+
+   To load Orca using the second directory structure into the
+   subversion repository rooted at http://svn.orcaware.com:8000/repos
+
+      % cd /tmp
+      % svn co http://svn.orcaware.com:8000/repos
+      % cd repos
+      % mkdir tags tags/orca trunk trunk/orca
+      % svn add tags trunk
+      % svn commit -m 'Create initial directory tree structure for projects.'
+
+   This script will create any subdirectories required to import your
+   directories into the repository, so these steps may not be required.
+
+3) Decide on the URL to use to access the subversion repository with
+   this script and the relative directory paths to the directories to
+   import your project into and to place the tags into.
+
+   The usage of the script is
+
+   ./svn_load_dirs.pl [-t tag_dir] svn_url import_dir dir_v1 [dir_v2 [..]]
+
+   The import_dir and tag_dir command line options are directory paths
+   relative to svn_url and tell the script where to load your project
+   and optionally the tags.  Both import_dir and tag_dir cannot
+   contain any ..'s and so svn_url must contain both import_dir and
+   tag_dir.
+
+   This script supports importing your directories into subdirectories
+   of the root of the subversion repository.
+
+   Example:
+
+   In the previous step, if you wanted to load a project named orca
+   into the second directory structure, say
+
+      /orca/branches
+      /orca/tags
+      /orca/trunk
+
+   and you didn't care about tags, then you could use as svn_url the
+   URL
+
+      http://svn.orcaware.com:8000/repos/orca
+
+   and use . as import_dir.
+
+   In this case, the script will only check out the orca subdirectory.
+   This is handy if the entire repository is very large and you don't
+   want this script to check the whole repository under /repos out to
+   load files into it.
+
+   The only caveat is that svn_url must exist already in the
+   repository.  So in this case, you would have to already have
+   created the orca subdirectory in the repository.
+
+4) Decide on the tags you want on your directories.  If you don't want
+   any tags, then ignore this step.
+
+   The script takes a -t command line argument that is a directory
+   path relative to the svn_url that you supply to this script from
+   step 3 above.  Again, the URL from step 3 does not need to be the
+   URL of the root of the subversion repository, so you can work in
+   the subdirectory just fine.
+
+   Look at the directories that will be loaded into the repository and
+   come up with a Perl regular expression that matches only the
+   portion of the directory name that identifies each directory.  You
+   may need to rename your directories so that they contain a version
+   number you can use to tag them properly.
+
+   The regular expression should be placed into the directory path
+   given to -t surrounded by @'s.  Make sure to protect the regular
+   expression from the shell by using quotes.
+
+   You can have multiple sets of regular expressions in the directory
+   path.
+
+   There is no way to escape the @ characters.
+
+   Example:
+
+   For the Orca directories orca-0.18 and orca-0.27b2 I can use the
+   regular expression \d+\.\w+.  I want the tags to be located in
+   the tags/orca/VERSION_NUMBER directory.  So I would use:
+
+      -t 'tags/orca/@\d+\.\w+@'
+
+5) Back up your Subversion repository in case you are not happy with
+   the results of running the script or the script fails for some
+   reason.
+
+   Example:
+
+   % /opt/i386-linux/apache-2.0/bin/apachectl stop
+   % cd /export/svn
+   % tar cvf repos_backup.tar repos
+   % /opt/i386-linux/apache-2.0/bin/apachectl start
+
+6) Run this script.  The first argument is the root of the Subversion
+   package directory where you want to install the directories.  The
+   directories are loaded in order that they appear on the command
+   line.
+
+   Example:
+
+      svn_load_dirs.pl http://svn.orcaware.com:8000/repos \
+         trunk/orca -t 'tags/orca/@\d+\.\w+@' orca-0.18 orca-0.27b2
+
+   The output from this script are:
+
+      A Added file or directory.
+      U File's contents have been updated.
+      d File or directory is deleted because an enclosing directory is
+        deleted.
+      D File or directory is deleted.
+
+7) Check the results by either checking out a new tree and or browsing
+   the repository with a browser.  If they are not what you want, back
+   out the changes.
+
+   Example:
+
+   These commands back out the changes:
+
+   % /opt/i386-linux/apache-2.0/bin/apachectl stop
+   % cd /export/svn
+   % rm -fr repos
+   % tar xvf repos_backup.tar
+   % /opt/i386-linux/apache-2.0/bin/apachectl start

=== added file 'contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in'
--- contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in	1970-01-01 00:00:00 +0000
+++ contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in	2009-12-12 13:21:15 +0000
@@ -0,0 +1,2049 @@
+#!/usr/bin/perl -w
+
+# Copyright (c) 2002,2003,2004,2005,2006,2007,2009 Dolby.  All rights reserved.
+#
+# Licensed under the Academic Free License version 3.0.  See LICENSE_AFL3.txt
+# or http://www.opensource.org/licenses/academic.php for a copy of the license
+# text.
+
+# $HeadURL: http://svn.collab.net/repos/svn/branches/1.6.x/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in $
+# $LastChangedDate: 2009-10-12 12:57:16 +0000 (Mon, 12 Oct 2009) $
+# $LastChangedBy: hwright $
+# $LastChangedRevision: 39956 $
+
+$| = 1;
+
+use strict;
+use Carp;
+use Cwd;
+use Digest::MD5  2.20;
+use File::Copy   2.03;
+use File::Find;
+use File::Path   1.0404;
+use File::Temp   0.12   qw(tempdir tempfile);
+use Getopt::Long 2.25;
+use Text::Wrap;
+use URI          1.17;
+use English;
+
+$Text::Wrap::columns = 72;
+
+# Specify the location of the svn command.
+my $svn = '@SVN_BINDIR@/svn';
+
+# Process the command line options.
+
+# The base URL for the portion of the repository to work in.  Note
+# that this does not have to be the root of the subversion repository,
+# it can point to a subdirectory in the repository.
+my $repos_base_url;
+
+# The relative path from the repository base URL to work in to the
+# directory to load the input directories into.
+my $repos_load_rel_path;
+
+# To specify where tags, which are simply copies of the imported
+# directory, should be placed relative to the repository base URL, use
+# the -t command line option.  This value must contain regular
+# expressions that match portions of the input directory names to
+# create an unique tag for each input directory.  The regular
+# expressions are surrounded by a specified character to distinguish
+# the regular expression from the normal directory path.
+my $opt_import_tag_location;
+
+# Do not ask for any user input.  Just go ahead and do everything.
+my $opt_no_user_input;
+
+# Do not automatically set the svn:executable property based on the
+# file's exe bit.
+my $opt_no_auto_exe;
+
+# Username to use for commits.
+my $opt_svn_username;
+
+# Password to use for commits.
+my $opt_svn_password;
+
+# Verbosity level.
+my $opt_verbose;
+
+# Path to already checked-out working copy.
+my $opt_existing_wc_dir;
+
+# List of filename patterns to ignore (as in .subversion/config's
+# "global-ignores" option).
+my $opt_glob_ignores;
+
+# This is the character used to separate regular expressions occuring
+# in the tag directory path from the path itself.
+my $REGEX_SEP_CHAR = '@';
+
+# This specifies a configuration file that contains a list of regular
+# expressions to check against a file and the properties to set on
+# matching files.
+my $property_config_filename;
+
+GetOptions('no_user_input'           => \$opt_no_user_input,
+           'no_auto_exe'             => \$opt_no_auto_exe,
+           'property_cfg_filename=s' => \$property_config_filename,
+           'svn_password=s'          => \$opt_svn_password,
+           'svn_username=s'          => \$opt_svn_username,
+           'tag_location=s'          => \$opt_import_tag_location,
+           'verbose+'                => \$opt_verbose,
+           'wc=s'                    => \$opt_existing_wc_dir,
+           'glob_ignores=s'          => \$opt_glob_ignores)
+  or &usage;
+&usage("$0: too few arguments") if @ARGV < 2;
+
+$repos_base_url      = shift;
+$repos_load_rel_path = shift;
+
+# Check that the repository base URL and the import directories do not
+# contain any ..'s.
+if ($repos_base_url =~ /\.{2}/)
+  {
+    die "$0: repos base URL $repos_base_url cannot contain ..'s.\n";
+  }
+if ($repos_load_rel_path =~ /\.{2}/)
+  {
+    die "$0: repos import relative directory path $repos_load_rel_path ",
+        "cannot contain ..'s.\n";
+  }
+
+# If there are no directories listed on the command line, then the
+# directories are read from standard input.  In this case, the
+# -no_user_input command line option must be specified.
+if (!@ARGV and !$opt_no_user_input)
+  {
+    &usage("$0: must use -no_user_input if no dirs listed on command line.");
+  }
+
+# The tag option cannot be used when directories are read from
+# standard input because tags may collide and no user input can be
+# taken to verify that the input is ok.
+if (!@ARGV and $opt_import_tag_location)
+  {
+    &usage("$0: cannot use -tag_location when dirs are read from stdin.");
+  }
+
+# If the tag directory is set, then the import directory cannot be '.'.
+if (defined $opt_import_tag_location and $repos_load_rel_path eq '.')
+  {
+    &usage("$0: cannot set import_dir to '.' and use -t command line option.");
+  }
+
+# Set the svn command line options that are used anytime svn connects
+# to the repository.
+my @svn_use_repos_cmd_opts;
+&set_svn_use_repos_cmd_opts($opt_svn_username, $opt_svn_password);
+
+# Check that the tag directories do not contain any ..'s.  Also, the
+# import and tag directories cannot be absolute.
+if (defined $opt_import_tag_location and $opt_import_tag_location =~ /\.{2}/)
+  {
+    die "$0: repos tag relative directory path $opt_import_tag_location ",
+        "cannot contain ..'s.\n";
+  }
+if ($repos_load_rel_path =~ m|^/|)
+  {
+    die "$0: repos import relative directory path $repos_load_rel_path ",
+        "cannot start with /.\n";
+  }
+if (defined $opt_import_tag_location and $opt_import_tag_location =~ m|^/|)
+  {
+    die "$0: repos tagrelative directory path $opt_import_tag_location ",
+        "cannot start with /.\n";
+  }
+
+if (defined $opt_existing_wc_dir)
+  {
+    unless (-e $opt_existing_wc_dir)
+      {
+        die "$0: working copy '$opt_existing_wc_dir' does not exist.\n";
+      }
+
+    unless (-d _)
+      {
+        die "$0: working copy '$opt_existing_wc_dir' is not a directory.\n";
+      }
+
+    unless (-d "$opt_existing_wc_dir/.svn")
+      {
+        die "$0: working copy '$opt_existing_wc_dir' does not have .svn ",
+            "directory.\n";
+      }
+
+    $opt_existing_wc_dir = Cwd::abs_path($opt_existing_wc_dir)
+  }
+
+# If no glob_ignores specified, try to deduce from config file,
+# or use the default below.
+my $ignores_str =
+    '*.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store';
+
+if ( defined $opt_glob_ignores)
+  {
+    $ignores_str = $opt_glob_ignores;
+  }
+elsif ( -f "$ENV{HOME}/.subversion/config" )
+  {
+    open my $conf, "$ENV{HOME}/.subversion/config";
+    while (<$conf>)
+      {
+        if ( /^global-ignores\s*=\s*(.*?)\s*$/ )
+          {
+	    $ignores_str = $1;
+            last;
+          }
+      }
+  }
+
+my @glob_ignores = map
+                     {
+                       s/\./\\\./g; s/\*/\.\*/g; "^$_\$";
+                     } split(/\s+/, $ignores_str);
+unshift @glob_ignores, '\.svn$';
+
+# Convert the string URL into a URI object.
+$repos_base_url    =~ s|/*$||;
+my $repos_base_uri = URI->new($repos_base_url);
+
+# Check that $repos_load_rel_path is not a directory here implying
+# that a command line option was forgotten.
+if ($repos_load_rel_path ne '.' and -d $repos_load_rel_path)
+  {
+    die "$0: import_dir '$repos_load_rel_path' is a directory.\n";
+  }
+
+# The remaining command line arguments should be directories.  Check
+# that they all exist and that there are no duplicates.
+if (@ARGV)
+  {
+    my %dirs;
+    foreach my $dir (@ARGV)
+      {
+        unless (-e $dir)
+          {
+            die "$0: directory '$dir' does not exist.\n";
+          }
+
+        unless (-d _)
+          {
+            die "$0: directory '$dir' is not a directory.\n";
+          }
+
+        if ($dirs{$dir})
+          {
+            die "$0: directory '$dir' is listed more than once on command ",
+                "line.\n";
+          }
+        $dirs{$dir} = 1;
+      }
+  }
+
+# Create the tag locations and print them for the user to review.
+# Check that there are no duplicate tags.
+my %load_tags;
+if (@ARGV and defined $opt_import_tag_location)
+  {
+    my %seen_tags;
+
+    foreach my $load_dir (@ARGV)
+      {
+        my $load_tag = &get_tag_dir($load_dir);
+
+        print "Directory $load_dir will be tagged as $load_tag\n";
+
+        if ($seen_tags{$load_tag})
+          {
+            die "$0: duplicate tag generated.\n";
+          }
+        $seen_tags{$load_tag} = 1;
+
+        $load_tags{$load_dir} = $load_tag;
+      }
+
+    exit 0 unless &get_answer("Please examine identified tags.  Are they " .
+                              "acceptable? (Y/n) ", 'ny', 1);
+    print "\n";
+  }
+
+# Load the property configuration filename, if one was specified, into
+# an array of hashes, where each hash contains a regular expression
+# and a property to apply to the file if the regular expression
+# matches.
+my @property_settings;
+if (defined $property_config_filename and length $property_config_filename)
+  {
+    open(CFG, $property_config_filename)
+      or die "$0: cannot open '$property_config_filename' for reading: $!\n";
+
+    my $ok = 1;
+
+    while (my $line = <CFG>)
+      {
+        next if $line =~ /^\s*$/;
+        next if $line =~ /^\s*#/;
+
+        # Split the input line into words taking into account that
+        # single or double quotes may define a single word with
+        # whitespace in it.  The format for the file is
+        # regex control property_name property_value
+        my @line = &split_line($line);
+        next if @line == 0;
+
+        unless (@line == 2 or @line == 4)
+          {
+            warn "$0: line $. of '$property_config_filename' has to have 2 ",
+                 "or 4 columns.\n";
+            $ok = 0;
+            next;
+          }
+        my ($regex, $control, $property_name, $property_value) = @line;
+
+        unless ($control eq 'break' or $control eq 'cont')
+          {
+            warn "$0: line $. of '$property_config_filename' has illegal ",
+                 "value for column 3 '$control', must be 'break' or 'cont'.\n";
+            $ok = 0;
+            next;
+          }
+
+        # Compile the regular expression.
+        my $re;
+        eval { $re = qr/$regex/i };
+        if ($@)
+          {
+            warn "$0: line $. of '$property_config_filename' regex '$regex' ",
+                 "does not compile:\n$@\n";
+            $ok = 0;
+            next;
+          }
+
+        push(@property_settings, {name    => $property_name,
+                                  value   => $property_value,
+                                  control => $control,
+                                  re      => $re});
+      }
+    close(CFG)
+      or warn "$0: error in closing '$property_config_filename' for ",
+              "reading: $!\n";
+
+    exit 1 unless $ok;
+  }
+
+# Check that the svn base URL works by running svn log on it.  Only
+# get the HEAD revision log message; there's no need to waste
+# bandwidth seeing all of the log messages.
+print "Checking that the base URL is a Subversion repository.\n";
+read_from_process($svn, 'log', '-r', 'HEAD',
+                  @svn_use_repos_cmd_opts, $repos_base_uri);
+print "\n";
+
+my $orig_cwd = cwd;
+
+# The first step is to determine the root of the svn repository.  Do
+# this with the svn log command.  Take the svn_url hostname and port
+# as the initial url and append to it successive portions of the final
+# path until svn log succeeds.
+print "Finding the root URL of the Subversion repository.\n";
+my $repos_root_uri;
+my $repos_root_uri_path;
+my $repos_base_path_segment;
+{
+  my $r = $repos_base_uri->clone;
+  my @path_segments            = grep { length($_) } $r->path_segments;
+  my @repos_base_path_segments = @path_segments;
+  unshift(@path_segments, '');
+  $r->path('');
+  my @r_path_segments;
+
+  while (@path_segments)
+    {
+      $repos_root_uri_path = shift @path_segments;
+      push(@r_path_segments, $repos_root_uri_path);
+      $r->path_segments(@r_path_segments);
+      if (safe_read_from_pipe($svn, 'log', '-r', 'HEAD',
+                              @svn_use_repos_cmd_opts, $r) == 0)
+        {
+          $repos_root_uri = $r;
+          last;
+        }
+      shift @repos_base_path_segments;
+    }
+  $repos_base_path_segment = join('/', @repos_base_path_segments);
+}
+
+if ($repos_root_uri)
+  {
+    print "Determined that the svn root URL is $repos_root_uri.\n\n";
+  }
+else
+  {
+    die "$0: cannot determine root svn URL.\n";
+  }
+
+# Create a temporary directory for svn to work in.
+my $temp_dir = tempdir( "svn_load_dirs_XXXXXXXXXX", TMPDIR => 1 );
+
+# Put in a signal handler to clean up any temporary directories.
+sub catch_signal {
+  my $signal = shift;
+  warn "$0: caught signal $signal.  Quitting now.\n";
+  exit 1;
+}
+
+$SIG{HUP}  = \&catch_signal;
+$SIG{INT}  = \&catch_signal;
+$SIG{TERM} = \&catch_signal;
+$SIG{PIPE} = \&catch_signal;
+
+# Create an object that when DESTROY'ed will delete the temporary
+# directory.  The CLEANUP flag to tempdir should do this, but they
+# call rmtree with 1 as the last argument which takes extra security
+# measures that do not clean up the .svn directories.
+my $temp_dir_cleanup = Temp::Delete->new;
+
+# Determine the native end of line style for this system.  Do this the
+# most portable way, by writing a file with a single \n in non-binary
+# mode and then reading the file in binary mode.
+my $native_eol = &determine_native_eol;
+
+# Check if all the directories exist to load the directories into the
+# repository.  If not, ask if they should be created.  For tags, do
+# not create the tag directory itself, that is done on the svn cp.
+{
+  print "Finding if any directories need to be created in repository.\n";
+
+  my @dirs_to_create;
+  my @urls_to_create;
+  my %seen_dir;
+  my @load_tags_without_last_segment;
+
+  # Assume that the last portion of the tag directory contains the
+  # version number and remove it from the directories to create,
+  # because the tag directory will be created by svn cp.
+  foreach my $load_tag (sort values %load_tags)
+    {
+      # Skip this tag if there is only one segment in its name.
+      my $index = rindex($load_tag, '/');
+      next if $index == -1;
+
+      # Trim off the last segment and record the result.
+      push(@load_tags_without_last_segment, substr($load_tag, 0, $index));
+    }
+  
+  foreach my $dir ($repos_load_rel_path, @load_tags_without_last_segment)
+    {
+      next unless length $dir;
+      my $d = '';
+      foreach my $segment (split('/', $dir))
+        {
+          $d = length $d ? "$d/$segment" : $segment;
+          my $url = "$repos_base_url/$d";
+          unless ($seen_dir{$d})
+            {
+              $seen_dir{$d} = 1;
+              if (safe_read_from_pipe($svn, 'log', '-r', 'HEAD',
+                                      @svn_use_repos_cmd_opts, $url) != 0)
+                {
+                  push(@dirs_to_create, $d);
+                  push(@urls_to_create, $url);
+                }
+            }
+        }
+    }
+
+  if (@dirs_to_create)
+    {
+      print "The following directories do not exist and need to exist:\n";
+      foreach my $dir (@dirs_to_create)
+        {
+          print "  $dir\n";
+        }
+      exit 0 unless &get_answer("You must add them now to load the " .
+                                "directories.  Continue (Y/n)? ", 'ny', 1);
+
+      my $message = "Create directories to load project into.\n\n";
+
+      foreach my $dir (@dirs_to_create)
+        {
+          if (length $repos_base_path_segment)
+            {
+              $message .= "* $repos_base_path_segment/$dir: New directory.\n";
+            }
+          else
+            {
+              $message .= "* $dir: New directory.\n";
+            }
+        }
+      $message = wrap('', '  ', $message);
+
+      read_from_process($svn, 'mkdir', @svn_use_repos_cmd_opts,
+                        '-m', $message, @urls_to_create);
+    }
+  else
+    {
+      print "No directories need to be created to prepare repository.\n";
+    }
+}
+
+# Either checkout a new working copy from the repository or use an
+# existing working copy.
+if (defined $opt_existing_wc_dir)
+  {
+    # Update an already existing working copy.
+    print "Not checking out anything; using existing working directory at\n";
+    print "$opt_existing_wc_dir\n";
+
+    chdir($opt_existing_wc_dir)
+      or die "$0: cannot chdir '$opt_existing_wc_dir': $!\n";
+
+    read_from_process($svn, 'update', @svn_use_repos_cmd_opts);
+  }
+else
+  {
+    # Check out the svn repository starting at the svn URL into a
+    # fixed directory name.
+    my $checkout_dir_name = 'my_import_wc';
+
+    # Check out only the directory being imported to, otherwise the
+    # checkout of the entire base URL can be very huge, if it contains
+    # a large number of tags.
+    my $checkout_url;
+    if ($repos_load_rel_path eq '.')
+      {
+        $checkout_url = $repos_base_url;
+      }
+    else
+      {
+        $checkout_url = "$repos_base_url/$repos_load_rel_path";
+      }
+
+    print "Checking out $checkout_url into $temp_dir/$checkout_dir_name\n";
+
+    chdir($temp_dir)
+      or die "$0: cannot chdir '$temp_dir': $!\n";
+
+    read_from_process($svn, 'checkout',
+                      @svn_use_repos_cmd_opts,
+                      $checkout_url, $checkout_dir_name);
+
+    chdir($checkout_dir_name)
+      or die "$0: cannot chdir '$checkout_dir_name': $!\n";
+  }
+
+# At this point, the current working directory is the top level
+# directory of the working copy.  Record the absolute path to this
+# location because the script will chdir back here later on.
+my $wc_import_dir_cwd = cwd;
+
+# Set up the names for the path to the import and tag directories.
+my $repos_load_abs_path;
+if ($repos_load_rel_path eq '.')
+  {
+    $repos_load_abs_path = length($repos_base_path_segment) ?
+                           $repos_base_path_segment : "/";
+  }
+else
+  {
+    $repos_load_abs_path = length($repos_base_path_segment) ?
+                           "$repos_base_path_segment/$repos_load_rel_path" :
+                           $repos_load_rel_path;
+  }
+
+# Now go through each source directory and copy each file from the
+# source directory to the target directory.  For new target files, add
+# them to svn.  For files that no longer exist, delete them.
+my $print_rename_message = 1;
+my @load_dirs            = @ARGV;
+while (defined (my $load_dir = &get_next_load_dir))
+  {
+    my $load_tag = $load_tags{$load_dir};
+
+    if (defined $load_tag)
+      {
+        print "\nLoading $load_dir and will save in tag $load_tag.\n";
+      }
+    else
+      {
+        print "\nLoading $load_dir.\n";
+      }
+
+    # The first hash is keyed by the old name in a rename and the
+    # second by the new name.  The last variable contains a list of
+    # old and new filenames in a rename.
+    my %rename_from_files;
+    my %rename_to_files;
+    my @renamed_filenames;
+
+    unless ($opt_no_user_input)
+      {
+        my $repeat_loop;
+        do
+          {
+            $repeat_loop = 0;
+
+            my %add_files;
+            my %del_files;
+
+            # Get the list of files and directories in the repository
+            # working copy.  This hash is called %del_files because
+            # each file or directory will be deleted from the hash
+            # using the list of files and directories in the source
+            # directory, leaving the files and directories that need
+            # to be deleted.
+            %del_files = &recursive_ls_and_hash($wc_import_dir_cwd);
+
+            # This anonymous subroutine finds all the files and
+            # directories in the directory to load.  It notes the file
+            # type and for each file found, it deletes it from
+            # %del_files.
+            my $wanted = sub
+              {
+                s#^\./##;
+                return if $_ eq '.';
+
+                my $source_path = $_;
+                my $dest_path   = "$wc_import_dir_cwd/$_";
+
+                my ($source_type) = &file_info($source_path);
+                my ($dest_type)   = &file_info($dest_path);
+
+                # Fail if the destination type exists but is of a
+                # different type of file than the source type.
+                if ($dest_type ne '0' and $source_type ne $dest_type)
+                  {
+                    die "$0: does not handle changing source and destination ",
+                        "type for '$source_path'.\n";
+                  }
+
+                if ($source_type ne 'd' and
+                    $source_type ne 'f' and
+                    $source_type ne 'l')
+                  {
+                    warn "$0: skipping loading file '$source_path' of type ",
+                         "'$source_type'.\n";
+                    unless ($opt_no_user_input)
+                      {
+                        print STDERR "Press return to continue: ";
+                        <STDIN>;
+                      }
+                    return;
+                  }
+
+                unless (defined delete $del_files{$source_path})
+                  {
+                    $add_files{$source_path}{type} = $source_type;
+                  }
+              };
+
+            # Now change into the directory containing the files to
+            # load.  First change to the original directory where this
+            # script was run so that if the specified directory is a
+            # relative directory path, then the script can change into
+            # it.
+            chdir($orig_cwd)
+              or die "$0: cannot chdir '$orig_cwd': $!\n";
+            chdir($load_dir)
+              or die "$0: cannot chdir '$load_dir': $!\n";
+
+            find({no_chdir   => 1,
+                  preprocess => sub { sort { $b cmp $a }
+                                      grep { $_ !~ /^[._]svn$/ } @_ },
+                  wanted     => $wanted
+                 }, '.');
+
+            # At this point %add_files contains the list of new files
+            # and directories to be created in the working copy tree
+            # and %del_files contains the files and directories that
+            # need to be deleted.  Because there may be renames that
+            # have taken place, give the user the opportunity to
+            # rename any deleted files and directories to ones being
+            # added.
+            my @add_files = sort keys %add_files;
+            my @del_files = sort keys %del_files;
+
+            # Because the source code management system may keep the
+            # original renamed file or directory in the working copy
+            # until a commit, remove them from the list of deleted
+            # files or directories.
+            &filter_renamed_files(\@del_files, \%rename_from_files);
+
+            # Now change into the working copy directory in case any
+            # renames need to be performed.
+            chdir($wc_import_dir_cwd)
+              or die "$0: cannot chdir '$wc_import_dir_cwd': $!\n";
+
+            # Only do renames if there are both added and deleted
+            # files and directories.
+            if (@add_files and @del_files)
+              {
+                my $max = @add_files > @del_files ? @add_files : @del_files;
+
+                # Print the files that have been added and deleted.
+                # Find the deleted file with the longest name and use
+                # that for the width of the filename column.  Add one
+                # to the filename width to let the directory /
+                # character be appended to a directory name.
+                my $line_number_width = 4;
+                my $filename_width    = 0;
+                foreach my $f (@del_files)
+                  {
+                    my $l = length($f);
+                    $filename_width = $l if $l > $filename_width;
+                  }
+                ++$filename_width;
+                my $printf_format = "%${line_number_width}d";
+
+                if ($print_rename_message)
+                  {
+                    $print_rename_message = 0;
+                    print "\n",
+                      "The following table lists files and directories that\n",
+                      "exist in either the Subversion repository or the\n",
+                      "directory to be imported but not both.  You now have\n",
+                      "the opportunity to match them up as renames instead\n",
+                      "of deletes and adds.  This is a Good Thing as it'll\n",
+                      "make the repository take less space.\n\n",
+                      "The left column lists files and directories that\n",
+                      "exist in the Subversion repository and do not exist\n",
+                      "in the directory being imported.  The right column\n",
+                      "lists files and directories that exist in the\n",
+                      "directory being imported.  Match up a deleted item\n",
+                      "from the left column with an added item from the\n",
+                      "right column.  Note the line numbers on the left\n",
+                      "which you type into this script to have a rename\n",
+                      "performed.\n";
+                  }
+
+                # Sort the added and deleted files and directories by
+                # the lowercase versions of their basenames instead of
+                # their complete path, which makes finding files that
+                # were moved into different directories easier to
+                # match up.
+                @add_files = map { $_->[0] }
+                             sort { $a->[1] cmp $b->[1] }
+                             map { [$_->[0], lc($_->[1])] }
+                             map { [$_, m#([^/]+)$#] }
+                             @add_files;
+                @del_files = map { $_->[0] }
+                             sort { $a->[1] cmp $b->[1] }
+                             map { [$_->[0], lc($_->[1])] }
+                             map { [$_, m#([^/]+)$#] }
+                             @del_files;
+
+              RELIST:
+
+                for (my $i=0; $i<$max; ++$i)
+                  {
+                    my $add_filename = '';
+                    my $del_filename = '';
+                    if ($i < @add_files)
+                      {
+                        $add_filename = $add_files[$i];
+                        if ($add_files{$add_filename}{type} eq 'd')
+                          {
+                            $add_filename .= '/';
+                          }
+                      }
+                    if ($i < @del_files)
+                      {
+                        $del_filename = $del_files[$i];
+                        if ($del_files{$del_filename}{type} eq 'd')
+                          {
+                            $del_filename .= '/';
+                          }
+                      }
+
+                    if ($i % 22 == 0)
+                      {
+                        print
+                          "\n",
+                          " " x $line_number_width,
+                          " ",
+                          "Deleted", " " x ($filename_width-length("Deleted")),
+                          " ",
+                          "Added\n";
+                      }
+
+                    printf $printf_format, $i;
+                    print  " ", $del_filename,
+                           "_" x ($filename_width - length($del_filename)),
+                           " ", $add_filename, "\n";
+
+                    if (($i+1) % 22 == 0)
+                      {
+                        unless (&get_answer("Continue printing (Y/n)? ",
+                                            'ny', 1))
+                          {
+                            last;
+                          }
+                      }
+                  }
+
+                # Get the feedback from the user.
+                my $line;
+                my $add_filename;
+                my $add_index;
+                my $del_filename;
+                my $del_index;
+                my $got_line = 0;
+                do {
+                  print "Enter two indexes for each column to rename, ",
+                        "(R)elist, or (F)inish: ";
+                  $line = <STDIN>;
+                  $line = '' unless defined $line;
+                  if ($line =~ /^R$/i )
+                    {
+                      goto RELIST;
+                    }
+                  
+                  if ($line =~ /^F$/i)
+                    {
+                      $got_line = 1;
+                    }
+                  elsif ($line =~ /^(\d+)\s+(\d+)$/)
+                    {
+                      print "\n";
+
+                      $del_index = $1;
+                      $add_index = $2;
+                      if ($del_index >= @del_files)
+                        {
+                          print "Delete index $del_index is larger than ",
+                                "maximum index of ", scalar @del_files - 1,
+                                ".\n";
+                          $del_index = undef;
+                        }
+                      if ($add_index > @add_files)
+                        {
+                          print "Add index $add_index is larger than maximum ",
+                                "index of ", scalar @add_files - 1, ".\n";
+                          $add_index = undef;
+                        }
+                      $got_line = defined $del_index && defined $add_index;
+
+                      # Check that the file or directory to be renamed
+                      # has the same file type.
+                      if ($got_line)
+                        {
+                          $add_filename = $add_files[$add_index];
+                          $del_filename = $del_files[$del_index];
+                          if ($add_files{$add_filename}{type} ne
+                              $del_files{$del_filename}{type})
+                            {
+                              print "File types for $del_filename and ",
+                                    "$add_filename differ.\n";
+                              $got_line = undef;
+                            }
+                        }
+                    }
+                } until ($got_line);
+
+                if ($line !~ /^F$/i)
+                  {
+                    print "Renaming $del_filename to $add_filename.\n";
+
+                    $repeat_loop = 1;
+
+                    # Because subversion cannot rename the same file
+                    # or directory twice, which includes doing a
+                    # rename of a file in a directory that was
+                    # previously renamed, a commit has to be
+                    # performed.  Check if the file or directory being
+                    # renamed now would cause such a problem and
+                    # commit if so.
+                    my $do_commit_now = 0;
+                    foreach my $rename_to_filename (keys %rename_to_files)
+                      {
+                        if (contained_in($del_filename,
+                                         $rename_to_filename,
+                                         $rename_to_files{$rename_to_filename}{type}))
+                          {
+                            $do_commit_now = 1;
+                            last;
+                          }
+                      }
+
+                    if ($do_commit_now)
+                      {
+                        print "Now committing previously run renames.\n";
+                        &commit_renames($load_dir,
+                                        \@renamed_filenames,
+                                        \%rename_from_files,
+                                        \%rename_to_files);
+                      }
+
+                    push(@renamed_filenames, $del_filename, $add_filename);
+                    {
+                      my $d = $del_files{$del_filename};
+                      $rename_from_files{$del_filename} = $d;
+                      $rename_to_files{$add_filename}   = $d;
+                    }
+
+                    # Check that any required directories to do the
+                    # rename exist.
+                    my @add_segments = split('/', $add_filename);
+                    pop(@add_segments);
+                    my $add_dir = '';
+                    my @add_dirs;
+                    foreach my $segment (@add_segments)
+                      {
+                        $add_dir = length($add_dir) ? "$add_dir/$segment" :
+                                                      $segment;
+                        unless (-d $add_dir)
+                          {
+                            push(@add_dirs, $add_dir);
+                          }
+                      }
+
+                    if (@add_dirs)
+                      {
+                        read_from_process($svn, 'mkdir', @add_dirs);
+                      }
+
+                    read_from_process($svn, 'mv',
+                                      $del_filename, $add_filename);
+                  }
+              }
+          } while ($repeat_loop);
+      }
+
+    # If there are any renames that have not been committed, then do
+    # that now.
+    if (@renamed_filenames)
+      {
+        &commit_renames($load_dir,
+                        \@renamed_filenames,
+                        \%rename_from_files,
+                        \%rename_to_files);
+      }
+
+    # At this point all renames have been performed.  Now get the
+    # final list of files and directories in the working copy
+    # directory.  The %add_files hash will contain the list of files
+    # and directories to add to the working copy and %del_files starts
+    # with all the files already in the working copy and gets files
+    # removed that are in the imported directory, which results in a
+    # list of files that should be deleted.  %upd_files holds the list
+    # of files that have been updated.
+    my %add_files;
+    my %del_files = &recursive_ls_and_hash($wc_import_dir_cwd);
+    my %upd_files;
+
+    # This anonymous subroutine copies files from the source directory
+    # to the working copy directory.
+    my $wanted = sub
+      {
+        s#^\./##;
+        return if $_ eq '.';
+
+        my $source_path = $_;
+        my $dest_path   = "$wc_import_dir_cwd/$_";
+
+        my ($source_type, $source_is_exe) = &file_info($source_path);
+        my ($dest_type)                   = &file_info($dest_path);
+
+        return if ($source_type ne 'd' and
+                   $source_type ne 'f' and
+                   $source_type ne 'l');
+
+        # Fail if the destination type exists but is of a different
+        # type of file than the source type.
+        if ($dest_type ne '0' and $source_type ne $dest_type)
+          {
+            die "$0: does not handle changing source and destination type ",
+                "for '$source_path'.\n";
+          }
+
+        # Determine if the file is being added or is an update to an
+        # already existing file using the file's digest.
+        my $del_info = delete $del_files{$source_path};
+        if (defined $del_info)
+          {
+            if (defined (my $del_digest = $del_info->{digest}))
+              {
+                my $new_digest = &digest_hash_file($source_path);
+                if ($new_digest ne $del_digest)
+                  {
+                    print "U   $source_path\n";
+                    $upd_files{$source_path} = $del_info;
+                  }
+              }
+          }
+        else
+          {
+            print "A   $source_path\n";
+            $add_files{$source_path}{type} = $source_type;
+
+            # Create an array reference to hold the list of properties
+            # to apply to this object.
+            unless (defined $add_files{$source_path}{properties})
+              {
+                $add_files{$source_path}{properties} = [];
+              }
+
+            # Go through the list of properties for a match on this
+            # file or directory and if there is a match, then apply
+            # the property to it.
+            foreach my $property (@property_settings)
+              {
+                my $re = $property->{re};
+                if ($source_path =~ $re)
+                  {
+                    my $property_name  = $property->{name};
+                    my $property_value = $property->{value};
+
+                    # The property value may not be set in the
+                    # configuration file, since the user may just want
+                    # to set the control flag.
+                    if (defined $property_name and defined $property_value)
+                      {
+                        # Ignore properties that do not apply to
+                        # directories.
+                        if ($source_type eq 'd')
+                          {
+                            if ($property_name eq 'svn:eol-style' or
+                                $property_name eq 'svn:executable' or
+                                $property_name eq 'svn:keywords' or
+                                $property_name eq 'svn:mime-type')
+                              {
+                                next;
+                              }
+                          }
+
+                        # Ignore properties that do not apply to
+                        # files.
+                        if ($source_type eq 'f')
+                          {
+                            if ($property_name eq 'svn:externals' or
+                                $property_name eq 'svn:ignore')
+                              {
+                                next;
+                              }
+                          }
+
+                        print "Adding to '$source_path' property ",
+                              "'$property_name' with value ",
+                              "'$property_value'.\n";
+
+                        push(@{$add_files{$source_path}{properties}},
+                             $property);
+                      }
+
+                    last if $property->{control} eq 'break';
+                  }
+              }
+          }
+
+        # Add svn:executable to files that have their executable bit
+        # set.
+        if ($source_is_exe and !$opt_no_auto_exe)
+          {
+            print "Adding to '$source_path' property 'svn:executable' with ",
+                  "value '*'.\n";
+            my $property = {name => 'svn:executable', value => '*'};
+            push (@{$add_files{$source_path}{properties}},
+                  $property);
+          }
+
+        # Now make sure the file or directory in the source directory
+        # exists in the repository.
+        if ($source_type eq 'd')
+          {
+            if ($dest_type eq '0')
+              {
+                mkdir($dest_path)
+                  or die "$0: cannot mkdir '$dest_path': $!\n";
+              }
+          }
+        elsif
+          ($source_type eq 'l') {
+            my $link_target = readlink($source_path)
+              or die "$0: cannot readlink '$source_path': $!\n";
+            if ($dest_type eq 'l')
+              {
+                my $old_target = readlink($dest_path)
+                  or die "$0: cannot readlink '$dest_path': $!\n";
+                return if ($old_target eq $link_target);
+                unlink($dest_path)
+                  or die "$0: unlink '$dest_path' failed: $!\n";
+              }
+            symlink($link_target, $dest_path)
+              or die "$0: cannot symlink '$dest_path' to '$link_target': $!\n";
+          }
+        elsif
+          ($source_type eq 'f') {
+            # Only copy the file if the digests do not match.
+            if ($add_files{$source_path} or $upd_files{$source_path})
+              {
+                copy($source_path, $dest_path)
+                  or die "$0: copy '$source_path' to '$dest_path': $!\n";
+              }
+          }
+        else
+          {
+            die "$0: does not handle copying files of type '$source_type'.\n";
+          }
+      };
+
+    # Now change into the directory containing the files to load.
+    # First change to the original directory where this script was run
+    # so that if the specified directory is a relative directory path,
+    # then the script can change into it.
+    chdir($orig_cwd)
+      or die "$0: cannot chdir '$orig_cwd': $!\n";
+    chdir($load_dir)
+      or die "$0: cannot chdir '$load_dir': $!\n";
+
+    find({no_chdir   => 1,
+          preprocess => sub { sort { $b cmp $a }
+                              grep { $_ !~ /^[._]svn$/ } @_ },
+          wanted     => $wanted
+         }, '.');
+
+    # The files and directories that are in %del_files are the files
+    # and directories that need to be deleted.  Because svn will
+    # return an error if a file or directory is deleted in a directory
+    # that subsequently is deleted, first find all directories and
+    # remove from the list any files and directories inside those
+    # directories from this list.  Work through the list repeatedly
+    # working from short to long names so that directories containing
+    # other files and directories will be deleted first.
+    my $repeat_loop;
+    do
+      {
+        $repeat_loop = 0;
+        my @del_files = sort {length($a) <=> length($b) || $a cmp $b}
+                        keys %del_files;
+        &filter_renamed_files(\@del_files, \%rename_from_files);
+        foreach my $file (@del_files)
+          {
+            if ($del_files{$file}{type} eq 'd')
+              {
+                my $dir        = "$file/";
+                my $dir_length = length($dir);
+                foreach my $f (@del_files)
+                  {
+                    next if $file eq $f;
+                    if (length($f) >= $dir_length and
+                        substr($f, 0, $dir_length) eq $dir)
+                      {
+                        print "d   $f\n";
+                        delete $del_files{$f};
+                        $repeat_loop = 1;
+                      }
+                  }
+
+                # If there were any deletions of files and/or
+                # directories inside a directory that will be deleted,
+                # then restart the entire loop again, because one or
+                # more keys have been deleted from %del_files.
+                # Equally important is not to stop this loop if no
+                # deletions have been done, otherwise later
+                # directories that may contain files and directories
+                # to be deleted will not be deleted.
+                last if $repeat_loop;
+              }
+          }
+      } while ($repeat_loop);
+
+    # What is left are files that are not in any directories to be
+    # deleted and directories to be deleted.  To delete the files,
+    # deeper files and directories must be deleted first.  Because we
+    # have a hash keyed by remaining files and directories to be
+    # deleted, instead of trying to figure out which directories and
+    # files are contained in other directories, just reverse sort by
+    # the path length and then alphabetically.
+    my @del_files = sort {length($b) <=> length($a) || $a cmp $b }
+                    keys %del_files;
+    &filter_renamed_files(\@del_files, \%rename_from_files);
+    foreach my $file (@del_files)
+      {
+        print "D   $file\n";
+      }
+
+    # Now change back to the trunk directory and run the svn commands.
+    chdir($wc_import_dir_cwd)
+      or die "$0: cannot chdir '$wc_import_dir_cwd': $!\n";
+
+    # If any of the added files have the svn:eol-style property set,
+    # then pass -b to diff, otherwise diff may fail because the end of
+    # lines have changed and the source file and file in the
+    # repository will not be identical.
+    my @diff_ignore_space_changes;
+
+    if (keys %add_files)
+      {
+        my @add_files = sort {length($a) <=> length($b) || $a cmp $b}
+                        keys %add_files;
+        my $target_filename = &make_targets_file(@add_files);
+        read_from_process($svn, 'add', '-N', '--targets', $target_filename);
+        unlink($target_filename);
+
+        # Add properties on the added files.
+        foreach my $add_file (@add_files)
+          {
+            foreach my $property (@{$add_files{$add_file}{properties}})
+              {
+                my $property_name  = $property->{name};
+                my $property_value = $property->{value};
+
+                if ($property_name eq 'svn:eol-style')
+                  {
+                    @diff_ignore_space_changes = ('-b');
+                  }
+                
+                # Write the value to a temporary file in case it's multi-line
+                my ($handle, $tmpfile) = tempfile(DIR => $temp_dir);
+                print $handle $property_value;
+                close($handle);
+
+                read_from_process($svn,
+                                  'propset',
+                                  $property_name,
+                                  '--file',
+                                  $tmpfile,
+                                  $add_file);
+              }
+          }
+      }
+    if (@del_files)
+      {
+        my $target_filename = &make_targets_file(@del_files);
+        read_from_process($svn, 'rm', '--targets', $target_filename);
+        unlink($target_filename);
+      }
+
+    # Go through the list of updated files and check the svn:eol-style
+    # property.  If it is set to native, then convert all CR, CRLF and
+    # LF's in the file to the native end of line characters.  Also,
+    # modify diff's command line so that it will ignore the change in
+    # end of line style.
+    if (keys %upd_files)
+      {
+        my @upd_files = sort {length($a) <=> length($b) || $a cmp $b}
+                        keys %upd_files;
+        foreach my $upd_file (@upd_files)
+          {
+            # Always append @BASE to a filename in case they contain a
+            # @ character, in which case the Subversion command line
+            # client will attempt to parse the characters after the @
+            # as a revision and most likely fail, or if the characters
+            # after the @ are a valid revision, then it'll possibly
+            # get the incorrect information.  So always append @BASE
+            # and any preceding @'s will be treated normally and the
+            # correct information will be retrieved.
+            my @command = ($svn,
+                           'propget',
+                           'svn:eol-style',
+                           "$upd_file\@BASE");
+            my @lines = read_from_process(@command);
+            next unless @lines;
+            if (@lines > 1)
+              {
+                warn "$0: '@command' returned more than one line of output: ",
+                  "'@lines'.\n";
+                next;
+              }
+
+            my $eol_style = $lines[0];
+            if ($eol_style eq 'native')
+              {
+                @diff_ignore_space_changes = ('-b');
+                if (&convert_file_to_native_eol($upd_file))
+                  {
+                    print "Native eol-style conversion modified $upd_file.\n";
+                  }
+              }
+          }
+      }
+
+    my $message = wrap('', '', "Load $load_dir into $repos_load_abs_path.\n");
+    read_from_process($svn, 'commit',
+                      @svn_use_repos_cmd_opts,
+                      '-m', $message);
+
+    # If an update is not run now after a commit, then some file and
+    # directory paths will have an older revisions associated with
+    # them and any future commits will fail because they are out of
+    # date.
+    read_from_process($svn, 'update', @svn_use_repos_cmd_opts);
+
+    # Now remove any files and directories to be deleted in the
+    # repository.
+    if (@del_files)
+      {
+        rmtree(\@del_files, 1, 0);
+      }
+
+    # Now make the tag by doing a copy in the svn repository itself.
+    if (defined $load_tag)
+      {
+        my $repos_tag_abs_path = length($repos_base_path_segment) ?
+                                 "$repos_base_path_segment/$load_tag" :
+                                 $load_tag;
+
+        my $from_url = $repos_load_rel_path eq '.' ?
+                       $repos_load_rel_path :
+                       "$repos_base_url/$repos_load_rel_path";
+        my $to_url   = "$repos_base_url/$load_tag";
+
+        $message     = wrap("",
+                            "",
+                            "Tag $repos_load_abs_path as " .
+                            "$repos_tag_abs_path.\n");
+        read_from_process($svn, 'cp', @svn_use_repos_cmd_opts,
+                          '-m', $message, $from_url, $to_url);
+
+        # Now check out the tag and run a recursive diff between the
+        # original source directory and the tag for a consistency
+        # check.
+        my $checkout_dir_name = "my_tag_wc_named_$load_tag";
+        print "Checking out $to_url into $temp_dir/$checkout_dir_name\n";
+
+        chdir($temp_dir)
+          or die "$0: cannot chdir '$temp_dir': $!\n";
+
+        read_from_process($svn, 'checkout',
+                          @svn_use_repos_cmd_opts,
+                          $to_url, $checkout_dir_name);
+
+        chdir($checkout_dir_name)
+          or die "$0: cannot chdir '$checkout_dir_name': $!\n";
+
+        chdir($orig_cwd)
+          or die "$0: cannot chdir '$orig_cwd': $!\n";
+        read_from_process('diff', '-u', @diff_ignore_space_changes,
+                          '-x', '.svn',
+                          '-r', $load_dir, "$temp_dir/$checkout_dir_name");
+      }
+  }
+
+exit 0;
+
+sub usage
+{
+  warn "@_\n" if @_;
+  die "usage: $0 [options] svn_url svn_import_dir [dir_v1 [dir_v2 [..]]]\n",
+      "  svn_url        is the file:// or http:// URL of the svn repository\n",
+      "  svn_import_dir is the path relative to svn_url where to load dirs\n",
+      "  dir_v1 ..      list dirs to import otherwise read from stdin\n",
+      "options are\n",
+      "  -no_user_input don't ask yes/no questions and assume yes answer\n",
+      "  -no_auto_exe   don't set svn:executable for executable files\n",
+      "  -p filename    table listing properties to apply to matching files\n",
+      "  -svn_username  username to perform commits as\n",
+      "  -svn_password  password to supply to svn commit\n",
+      "  -t tag_dir     create a tag copy in tag_dir, relative to svn_url\n",
+      "  -v             increase program verbosity, multiple -v's allowed\n",
+      "  -wc path       use the already checked-out working copy at path\n",
+      "                 instead of checkout out a fresh working copy\n",
+      "  -glob_ignores  List of filename patterns to ignore (as in svn's\n",
+      "                 global-ignores config option)\n";
+}
+
+# Get the next directory to load, either from the command line or from
+# standard input.
+my $get_next_load_dir_init = 0;
+my @get_next_load_dirs;
+sub get_next_load_dir
+{
+  if (@ARGV)
+    {
+      unless ($get_next_load_dir_init)
+        {
+          $get_next_load_dir_init = 1;
+          @get_next_load_dirs     = @ARGV;
+        }
+      return shift @get_next_load_dirs;
+    }
+
+  if ($opt_verbose)
+    {
+      print "Waiting for next directory to import on standard input:\n";
+    }
+  my $line = <STDIN>;
+
+  print "\n" if $opt_verbose;
+
+  chomp $line;
+  if ($line =~ m|(\S+)\s+(\S+)|)
+    {
+      $line = $1;
+      set_svn_use_repos_cmd_opts($2, $opt_svn_password);
+    }
+  $line;
+}
+
+# This constant stores the commonly used string to indicate that a
+# subroutine has been passed an incorrect number of arguments.
+use vars qw($INCORRECT_NUMBER_OF_ARGS);
+$INCORRECT_NUMBER_OF_ARGS = "passed incorrect number of arguments.\n";
+
+# Creates a temporary file in the temporary directory and stores the
+# arguments in it for use by the svn --targets command line option.
+# If any part of the file creation failed, exit the program, as
+# there's no workaround.  Use a unique number as a counter to the
+# files.
+my $make_targets_file_counter;
+sub make_targets_file
+{
+  unless (@_)
+    {
+      confess "$0: make_targets_file $INCORRECT_NUMBER_OF_ARGS";
+    }
+
+  $make_targets_file_counter = 1 unless defined $make_targets_file_counter;
+
+  my $filename = sprintf "%s/targets.%05d",
+                 $temp_dir,
+                 $make_targets_file_counter;
+  ++$make_targets_file_counter;
+
+  open(TARGETS, ">$filename")
+    or die "$0: cannot open '$filename' for writing: $!\n";
+
+  foreach my $file (@_)
+    {
+      print TARGETS "$file\n";
+    }
+
+  close(TARGETS)
+    or die "$0: error in closing '$filename' for writing: $!\n";
+
+  $filename;
+}
+
+# Set the svn command line options that are used anytime svn connects
+# to the repository.
+sub set_svn_use_repos_cmd_opts
+{
+  unless (@_ == 2)
+    {
+      confess "$0: set_svn_use_repos_cmd_opts $INCORRECT_NUMBER_OF_ARGS";
+    }
+
+  my $username = shift;
+  my $password = shift;
+
+  @svn_use_repos_cmd_opts = ('--non-interactive');
+  if (defined $username and length $username)
+    {
+      push(@svn_use_repos_cmd_opts, '--username', $username);
+    }
+  if (defined $password)
+    {
+      push(@svn_use_repos_cmd_opts, '--password', $password);
+    }
+}
+
+sub get_tag_dir
+{
+  unless (@_ == 1)
+    {
+      confess "$0: get_tag_dir $INCORRECT_NUMBER_OF_ARGS";
+    }
+
+  my $load_dir = shift;
+
+  # Take the tag relative directory, search for pairs of
+  # REGEX_SEP_CHAR's and use the regular expression inside the pair to
+  # put in the tag directory name.
+  my $tag_location = $opt_import_tag_location;
+  my $load_tag     = '';
+  while ((my $i = index($tag_location, $REGEX_SEP_CHAR)) >= 0)
+    {
+      $load_tag .= substr($tag_location, 0, $i, '');
+      substr($tag_location, 0, 1, '');
+      my $j = index($tag_location, $REGEX_SEP_CHAR);
+      if ($j < 0)
+        {
+          die "$0: -t value '$opt_import_tag_location' does not have ",
+              "matching $REGEX_SEP_CHAR.\n";
+        }
+      my $regex = substr($tag_location, 0, $j, '');
+      $regex = "($regex)" unless ($regex =~ /\(.+\)/);
+      substr($tag_location, 0, 1, '');
+      my @results = $load_dir =~ m/$regex/;
+      $load_tag .= join('', @results);
+    }
+  $load_tag .= $tag_location;
+
+  $load_tag;
+}
+
+# Return a two element array.  The first element is a single character
+# that represents the type of object the path points to.  The second
+# is a boolean (1 for true, '' for false) if the path points to a file
+# and if the file is executable.
+sub file_info
+{
+  lstat(shift) or return ('0', '');
+  -b _ and return ('b', '');
+  -c _ and return ('c', '');
+  -d _ and return ('d', '');
+  -f _ and return ('f', -x _);
+  -l _ and return ('l', '');
+  -p _ and return ('p', '');
+  -S _ and return ('S', '');
+  return '?';
+}
+
+# Start a child process safely without using /bin/sh.
+sub safe_read_from_pipe
+{
+  unless (@_)
+    {
+      croak "$0: safe_read_from_pipe $INCORRECT_NUMBER_OF_ARGS";
+    }
+
+  my $openfork_available = "MSWin32" ne $OSNAME;
+  if ($openfork_available)
+    {
+      print "Running @_\n";
+      my $pid = open(SAFE_READ, "-|");
+      unless (defined $pid)
+        {
+          die "$0: cannot fork: $!\n";
+        }
+      unless ($pid)
+        {
+          # child
+          open(STDERR, ">&STDOUT")
+            or die "$0: cannot dup STDOUT: $!\n";
+          exec(@_)
+            or die "$0: cannot exec '@_': $!\n";
+        }
+    }
+  else
+    {
+      # Redirect the comment into a temp file and use that to work around
+      # Windoze's (non-)handling of multi-line commands.
+      my @commandline = ();
+      my $command;
+      my $comment;
+        
+      while ($command = shift)
+        {
+          if ("-m" eq $command)
+            {
+              my $comment = shift;
+              my ($handle, $tmpfile) = tempfile(DIR => $temp_dir);
+              print $handle $comment;
+              close($handle);
+                
+              push(@commandline, "--file");
+              push(@commandline, $tmpfile);
+            }
+          else
+            {
+              # Munge the command to protect it from the command line
+              $command =~ s/\"/\\\"/g;
+              if ($command =~ m"\s") { $command = "\"$command\""; }
+              if ($command eq "") { $command = "\"\""; }
+              if ($command =~ m"\n")
+                {
+                  warn "$0: carriage return detected in command - may not work\n";
+                }
+              push(@commandline, $command);
+            }
+        }
+        
+      print "Running @commandline\n";
+      if ( $comment ) { print $comment; }
+        
+      # Now do the pipe.
+      open(SAFE_READ, "@commandline |")
+        or die "$0: cannot pipe to command: $!\n";
+    }
+    
+  # parent
+  my @output;
+  while (<SAFE_READ>)
+    {
+      chomp;
+      push(@output, $_);
+    }
+  close(SAFE_READ);
+  my $result = $?;
+  my $exit   = $result >> 8;
+  my $signal = $result & 127;
+  my $cd     = $result & 128 ? "with core dump" : "";
+  if ($signal or $cd)
+    {
+      warn "$0: pipe from '@_' failed $cd: exit=$exit signal=$signal\n";
+    }
+  if (wantarray)
+    {
+      return ($result, @output);
+    }
+  else
+    {
+      return $result;
+    }
+}
+
+# Use safe_read_from_pipe to start a child process safely and exit the
+# script if the child failed for whatever reason.
+sub read_from_process
+{
+  unless (@_)
+    {
+      croak "$0: read_from_process $INCORRECT_NUMBER_OF_ARGS";
+    }
+  my ($status, @output) = &safe_read_from_pipe(@_);
+  if ($status)
+    {
+      print STDERR "$0: @_ failed with this output:\n", join("\n", @output),
+                   "\n";
+      unless ($opt_no_user_input)
+        {
+          print STDERR
+            "Press return to quit and clean up svn working directory: ";
+          <STDIN>;
+        }
+      exit 1;
+    }
+  else
+    {
+      return @output;
+    }
+}
+
+# Get a list of all the files and directories in the specified
+# directory, the type of file and a digest hash of file types.
+sub recursive_ls_and_hash
+{
+  unless (@_ == 1)
+    {
+      croak "$0: recursive_ls_and_hash $INCORRECT_NUMBER_OF_ARGS";
+    }
+
+  # This is the directory to change into.
+  my $dir = shift;
+
+  # Get the current directory so that the script can change into the
+  # current working directory after changing into the specified
+  # directory.
+  my $return_cwd = cwd;
+
+  chdir($dir)
+    or die "$0: cannot chdir '$dir': $!\n";
+
+  my %files;
+
+  my $wanted = sub
+    {
+      s#^\./##;
+      return if $_ eq '.';
+      my ($file_type) = &file_info($_);
+      my $file_digest;
+      if ($file_type eq 'f' or ($file_type eq 'l' and stat($_) and -f _))
+        {
+          $file_digest = &digest_hash_file($_);
+        }
+      $files{$_} = {type   => $file_type,
+                    digest => $file_digest};
+    };
+  find({no_chdir   => 1,
+        preprocess => sub
+	  {
+            grep
+              {
+                my $ok=1;
+                foreach my $x (@glob_ignores)
+                  {
+                    if ( $_ =~ /$x/ ) {$ok=0;last;}
+                  }
+                $ok
+              } @_
+          },
+        wanted     => $wanted
+       }, '.');
+
+  chdir($return_cwd)
+    or die "$0: cannot chdir '$return_cwd': $!\n";
+
+  %files;
+}
+
+# Given a list of files and directories which have been renamed but
+# not commtited, commit them with a proper log message.
+sub commit_renames
+{
+  unless (@_ == 4)
+    {
+      croak "$0: commit_renames $INCORRECT_NUMBER_OF_ARGS";
+    }
+
+  my $load_dir          = shift;
+  my $renamed_filenames = shift;
+  my $rename_from_files = shift;
+  my $rename_to_files   = shift;
+
+  my $number_renames    = @$renamed_filenames/2;
+
+  my $message = "To prepare to load $load_dir into $repos_load_abs_path, " .
+                "perform $number_renames rename" .
+                ($number_renames > 1 ? "s" : "") . ".\n";
+
+  # Text::Wrap::wrap appears to replace multiple consecutive \n's with
+  # one \n, so wrap the text and then append the second \n.
+  $message  = wrap("", "", $message) . "\n";
+  while (@$renamed_filenames)
+    {
+      my $from  = "$repos_load_abs_path/" . shift @$renamed_filenames;
+      my $to    = "$repos_load_abs_path/" . shift @$renamed_filenames;
+      $message .= wrap("", "  ", "* $to: Renamed from $from.\n");
+    }
+
+  # Change to the top of the working copy so that any
+  # directories will also be updated.
+  my $cwd = cwd;
+  chdir($wc_import_dir_cwd)
+    or die "$0: cannot chdir '$wc_import_dir_cwd': $!\n";
+  read_from_process($svn, 'commit', @svn_use_repos_cmd_opts, '-m', $message);
+  read_from_process($svn, 'update', @svn_use_repos_cmd_opts);
+  chdir($cwd)
+    or die "$0: cannot chdir '$cwd': $!\n";
+
+  # Some versions of subversion have a bug where renamed files
+  # or directories are not deleted after a commit, so do that
+  # here.
+  my @del_files = sort {length($b) <=> length($a) || $a cmp $b }
+                  keys %$rename_from_files;
+  rmtree(\@del_files, 1, 0);
+
+  # Empty the list of old and new renamed names.
+  undef %$rename_from_files;
+  undef %$rename_to_files;
+}
+
+# Take a one file or directory and see if its name is equal to a
+# second or is contained in the second if the second file's file type
+# is a directory.
+sub contained_in
+{
+  unless (@_ == 3)
+    {
+      croak "$0: contain_in $INCORRECT_NUMBER_OF_ARGS";
+    }
+
+  my $contained      = shift;
+  my $container      = shift;
+  my $container_type = shift;
+
+  if ($container eq $contained)
+    {
+      return 1;
+    }
+
+  if ($container_type eq 'd')
+    {
+      my $dirname        = "$container/";
+      my $dirname_length = length($dirname);
+
+      if ($dirname_length <= length($contained) and
+          $dirname eq substr($contained, 0, $dirname_length))
+        {
+          return 1;
+        }
+    }
+
+  return 0;
+}
+
+# Take an array reference containing a list of files and directories
+# and take a hash reference and remove from the array reference any
+# files and directories and the files the directory contains listed in
+# the hash.
+sub filter_renamed_files
+{
+  unless (@_ == 2)
+    {
+      croak "$0: filter_renamed_files $INCORRECT_NUMBER_OF_ARGS";
+    }
+
+  my $array_ref = shift;
+  my $hash_ref  = shift;
+
+  foreach my $remove_filename (keys %$hash_ref)
+    {
+      my $remove_file_type = $hash_ref->{$remove_filename}{type};
+      for (my $i=0; $i<@$array_ref;)
+        {
+          if (contained_in($array_ref->[$i],
+                           $remove_filename,
+                           $remove_file_type))
+            {
+              splice(@$array_ref, $i, 1);
+              next;
+            }
+          ++$i;
+        }
+    }
+}
+
+# Get a digest hash of the specified filename.
+sub digest_hash_file
+{
+  unless (@_ == 1)
+    {
+      croak "$0: digest_hash_file $INCORRECT_NUMBER_OF_ARGS";
+    }
+
+  my $filename = shift;
+
+  my $ctx = Digest::MD5->new;
+  if (open(READ, $filename))
+    {
+      binmode READ;
+      $ctx->addfile(*READ);
+      close(READ);
+    }
+  else
+    {
+      die "$0: cannot open '$filename' for reading: $!\n";
+    }
+  $ctx->digest;
+}
+
+# Read standard input until a line contains the required input or an
+# empty line to signify the default answer.
+sub get_answer
+{
+  unless (@_ == 3)
+    {
+      croak "$0: get_answer $INCORRECT_NUMBER_OF_ARGS";
+    }
+
+  my $message = shift;
+  my $answers = shift;
+  my $def_ans = shift;
+
+  return $def_ans if $opt_no_user_input;
+
+  my $char;
+  do
+    {
+      print $message;
+      $char = '';
+      my $line = <STDIN>;
+      if (defined $line and length $line)
+        {
+          $char = substr($line, 0, 1);
+          $char = '' if $char eq "\n";
+        }
+    } until $char eq '' or $answers =~ /$char/ig;
+
+  return $def_ans if $char eq '';
+  return pos($answers) - 1;
+}
+
+# Determine the native end of line on this system by writing a \n in
+# non-binary mode to an empty file and reading the same file back in
+# binary mode.
+sub determine_native_eol
+{
+  my $filename = "$temp_dir/svn_load_dirs_eol_test.$$";
+  if (-e $filename)
+    {
+      unlink($filename)
+        or die "$0: cannot unlink '$filename': $!\n";
+    }
+
+  # Write the \n in non-binary mode.
+  open(NL_TEST, ">$filename")
+    or die "$0: cannot open '$filename' for writing: $!\n";
+  print NL_TEST "\n";
+  close(NL_TEST)
+    or die "$0: error in closing '$filename' for writing: $!\n";
+
+  # Read the \n in binary mode.
+  open(NL_TEST, $filename)
+    or die "$0: cannot open '$filename' for reading: $!\n";
+  binmode NL_TEST;
+  local $/;
+  undef $/;
+  my $eol = <NL_TEST>;
+  close(NL_TEST)
+    or die "$0: cannot close '$filename' for reading: $!\n";
+  unlink($filename)
+    or die "$0: cannot unlink '$filename': $!\n";
+
+  my $eol_length = length($eol);
+  unless ($eol_length)
+    {
+      die "$0: native eol length on this system is 0.\n";
+    }
+
+  print "Native EOL on this system is ";
+  for (my $i=0; $i<$eol_length; ++$i)
+    {
+      printf "\\%03o", ord(substr($eol, $i, 1));
+    }
+  print ".\n\n";
+
+  $eol;
+}
+
+# Take a filename, open the file and replace all CR, CRLF and LF's
+# with the native end of line style for this system.
+sub convert_file_to_native_eol
+{
+  unless (@_ == 1)
+    {
+      croak "$0: convert_file_to_native_eol $INCORRECT_NUMBER_OF_ARGS";
+    }
+
+  my $filename = shift;
+  open(FILE, $filename)
+    or die "$0: cannot open '$filename' for reading: $!\n";
+  binmode FILE;
+  local $/;
+  undef $/;
+  my $in = <FILE>;
+  close(FILE)
+    or die "$0: error in closing '$filename' for reading: $!\n";
+  my $out = '';
+
+  # Go through the file and transform it byte by byte.
+  my $i = 0;
+  while ($i < length($in))
+    {
+      my $cc = substr($in, $i, 2);
+      if ($cc eq "\015\012")
+        {
+          $out .= $native_eol;
+          $i += 2;
+          next;
+        }
+
+      my $c = substr($cc, 0, 1);
+      if ($c eq "\012" or $c eq "\015")
+        {
+          $out .= $native_eol;
+        }
+      else
+        {
+          $out .= $c;
+        }
+      ++$i;
+    }
+
+  return 0 if $in eq $out;
+
+  my $tmp_filename = ".svn/tmp/svn_load_dirs.$$";
+  open(FILE, ">$tmp_filename")
+    or die "$0: cannot open '$tmp_filename' for writing: $!\n";
+  binmode FILE;
+  print FILE $out;
+  close(FILE)
+    or die "$0: cannot close '$tmp_filename' for writing: $!\n";
+  rename($tmp_filename, $filename)
+    or die "$0: cannot rename '$tmp_filename' to '$filename': $!\n";
+
+  return 1;
+}
+
+# Split the input line into words taking into account that single or
+# double quotes may define a single word with whitespace in it.
+sub split_line
+{
+  unless (@_ == 1)
+    {
+      croak "$0: split_line $INCORRECT_NUMBER_OF_ARGS";
+    }
+
+  my $line = shift;
+
+  # Strip leading whitespace.  Do not strip trailing whitespace which
+  # may be part of quoted text that was never closed.
+  $line =~ s/^\s+//;
+
+  my $line_length  = length $line;
+  my @words        = ();
+  my $current_word = '';
+  my $in_quote     = '';
+  my $in_protect   = '';
+  my $in_space     = '';
+  my $i            = 0;
+
+  while ($i < $line_length)
+    {
+      my $c = substr($line, $i, 1);
+      ++$i;
+
+      if ($in_protect)
+        {
+          if ($c eq $in_quote)
+            {
+              $current_word .= $c;
+            }
+          elsif ($c eq '"' or $c eq "'")
+            {
+              $current_word .= $c;
+            }
+          else
+            {
+              $current_word .= "$in_protect$c";
+            }
+          $in_protect = '';
+        }
+      elsif ($c eq '\\')
+        {
+          $in_protect = $c;
+        }
+      elsif ($in_quote)
+        {
+          if ($c eq $in_quote)
+            {
+              $in_quote = '';
+            }
+          else
+            {
+              $current_word .= $c;
+            }
+        }
+      elsif ($c eq '"' or $c eq "'")
+        {
+          $in_quote = $c;
+        }
+      elsif ($c =~ m/^\s$/)
+        {
+          unless ($in_space)
+            {
+              push(@words, $current_word);
+              $current_word = '';
+            }
+        }
+      else
+        {
+          $current_word .= $c;
+        }
+
+      $in_space = $c =~ m/^\s$/;
+    }
+
+  # Handle any leftovers.
+  $current_word .= $in_protect if $in_protect;
+  push(@words, $current_word) if length $current_word;
+
+  @words;
+}
+
+# This package exists just to delete the temporary directory.
+package Temp::Delete;
+
+sub new
+{
+  bless {}, shift;
+}
+
+sub DESTROY
+{
+  print "Cleaning up $temp_dir\n";
+  File::Path::rmtree([$temp_dir], 0, 0);
+}

=== added file 'contrib/client-side/svn_load_dirs/svn_load_dirs_property_table.example'
--- contrib/client-side/svn_load_dirs/svn_load_dirs_property_table.example	1970-01-01 00:00:00 +0000
+++ contrib/client-side/svn_load_dirs/svn_load_dirs_property_table.example	2009-12-12 13:21:15 +0000
@@ -0,0 +1,29 @@
+# This is sample table for svn_load_dirs.pl -p command line option.
+\.(ai|eps|ps)$		break	svn:mime-type	application/postscript
+\.bz2$			break	svn:mime-type	application/x-bzip2
+\.css$			break	svn:mime-type	text/css
+\.doc$			break	svn:mime-type	application/msword
+\.ds(p|w)$		break	svn:eol-style	CRLF
+\.exe$			break	svn:mime-type	application/octet-stream
+\.gif$			break	svn:mime-type	image/gif
+\.gtar$			break	svn:mime-type	application/x-gtar
+\.(gz|tgz)$		break	svn:mime-type	application/x-gzip
+\.hqx$			break	svn:mime-type	application/mac-binhex40
+\.html?$		break	svn:mime-type	text/html
+\.ilk$			break	svn:eol-style	CRLF
+\.(jpeg|jpg|jpe)$	break	svn:mime-type	image/jpeg
+\.js$			break	svn:mime-type	application/x-javascript
+\.(mov|qt)$		break	svn:mime-type	video/quicktime
+\.ncb$			break	svn:eol-style	CRLF
+\.opt$			break	svn:eol-style	CRLF
+\.pdf$			break	svn:mime-type	application/pdf
+\.png$			break	svn:mime-type	image/png
+\.pp(s|t)$		break	svn:mime-type	application/vnd.ms-powerpoint
+\.rtf$			break	svn:mime-type	application/rtf
+\.swf$			break	svn:mime-type	application/x-shockwave-flash
+\.tar$			break	svn:mime-type	application/x-tar
+\.tiff?$		break	svn:mime-type	image/tiff
+\.xls$			break	svn:mime-type	application/vnd.ms-excel
+\.zip$			break	svn:mime-type	application/zip
+dos2unix-eol\.sh$	break
+#.*			break	svn:eol-style	native

=== added file 'contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py'
--- contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py	1970-01-01 00:00:00 +0000
+++ contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py	2009-12-12 13:21:15 +0000
@@ -0,0 +1,452 @@
+#!/usr/bin/env python
+#
+# svnmerge-migrate-history-remotely.py: Remotely migrate merge history from
+#     svnmerge.py's format to Subversion 1.5's format.
+#
+# ====================================================================
+# Copyright (c) 2008 CollabNet.  All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at http://subversion.tigris.org/license-1.html.
+# If newer versions of this license are posted there, you may use a
+# newer version instead, at your option.
+#
+# This software consists of voluntary contributions made by many
+# individuals.  For exact contribution history, see the revision
+# history and logs, available at http://subversion.tigris.org/.
+# ====================================================================
+
+# $HeadURL: http://svn.collab.net/repos/svn/branches/1.6.x/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py $
+# $Date: 2009-01-20 22:25:54 +0000 (Tue, 20 Jan 2009) $
+# $Author: cmpilato $
+# $Rev: 35358 $
+
+
+### THE SVNMERGE HISTORY MIGRATION ALGORITHM EMPLOYED HEREIN
+###
+### 1. Fetch properties for PATH, looking specifically for
+###    'svnmerge-blocked', and 'svnmerge-integrated'.
+###
+### 2. Convert properties into real mergeinfo.  NOTE: svnmerge-*
+###    properties have a slightly different and more flexible syntax.
+###
+### 3. Combine mergeinfos together.
+###
+### 4. [non-naive] Subtract natural history of the merge target from
+###    its own mergeinfo.
+###
+### 5. [non-naive] Filter mergeinfo by merge source natural history
+###    (so that mergeinfo only reflects real locations).