Update to 0.27.0

Lots of bug-fixes and changes. Eg.:
* fixed 'svn merge':
     . (r6447,#1402) -r FOO:PREV works correctly
     . (r6452,#1379) no longer prints confusing no-op lines
     . (r6500/6503,#1399) warn user when a tree-delta chunk can't be applied
* cvs2svn.py:  lots of bugfixing related to branch/tag support
* fixed 'svn diff' and 'svn merge':
     . (r6604, #1311) diff URL URL on files now works
     . (r6668, #1142) diff comparing wc to repos branch
     . (r6687, #1297) diff/merge interaction in file adds
     . (r6703, #1319) merge problem with adding subtrees
     . (#6607) new default ancestry-following behavior for diff, merge

(Have a look at CHANGES for a complete list.)

OK'ed by epg@

6 files changed, 38 insertions, 38 deletions

diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index c2a92696096..3ffcabdf671 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.3 2003/07/12 05:39:41 epg Exp $
+# $NetBSD: Makefile.version,v 1.4 2003/08/15 19:27:43 recht Exp $
 
 .if !defined(SVNVER)
-SVNVER=		0.25
+SVNVER=		0.27.0
 # This macro is in this file because the URL changes with every release.
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/5110/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/5642/
 .endif
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 3baccfe076f..baf5d25d639 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2003/07/12 05:39:42 epg Exp $
+$NetBSD: distinfo,v 1.11 2003/08/15 19:27:44 recht Exp $
 
-SHA1 (subversion-0.25.tar.gz) = 03b36709d3bbbc0eb665b578341d18743d10d672
-Size (subversion-0.25.tar.gz) = 5821703 bytes
-SHA1 (patch-aa) = 994c64bce9b6f237435a2fb57364a12dc3d502e1
-SHA1 (patch-ac) = 4468a8196a1cc151ed4bc626bbebf0bf622d5871
-SHA1 (patch-ad) = 6b786776e012917b88c9eee49f0a6c0ab34bc941
-SHA1 (patch-ae) = 76481c3e7185d79c1dec5ee84fba590a4e03e39f
+SHA1 (subversion-0.27.0.tar.gz) = 9c1844825991ed46dbc5394690b795435851b090
+Size (subversion-0.27.0.tar.gz) = 7326370 bytes
+SHA1 (patch-aa) = 15356102bdef8c5441fd7187bba2d052c9918b58
+SHA1 (patch-ac) = 6f57283a7b0088d596461b31ebf2838be3f440c6
+SHA1 (patch-ad) = fba4b284dd3cceffdb5bfa68917f734e900f67a7
+SHA1 (patch-ae) = c44ab54dccdec60fa83a86464bef1eba68597615
diff --git a/devel/subversion/patches/patch-aa b/devel/subversion/patches/patch-aa
index 52ebcf5e151..11da3019d6c 100644
--- a/devel/subversion/patches/patch-aa
+++ b/devel/subversion/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2003/06/18 13:26:26 epg Exp $
+$NetBSD: patch-aa,v 1.5 2003/08/15 19:27:45 recht Exp $
 
---- build-outputs.mk.orig	Mon Jun 16 08:27:37 2003
-+++ build-outputs.mk
-@@ -109,10 +109,10 @@ libsvn_swig_java_OBJECTS = swigutil_java
- subversion/bindings/swig/libsvn_swig_java-1.la: $(libsvn_swig_java_DEPS)
- 	cd subversion/bindings/swig && $(LINK) -o libsvn_swig_java-1.la $(libsvn_swig_java_OBJECTS) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
+--- build-outputs.mk.orig	2003-08-14 14:26:47.000000000 +0200
++++ build-outputs.mk	2003-08-15 18:05:32.000000000 +0200
+@@ -114,10 +114,10 @@
+ subversion/bindings/swig/libsvn_swig_perl-1.la: $(libsvn_swig_perl_DEPS)
+ 	cd subversion/bindings/swig && $(LINK) -o libsvn_swig_perl-1.la $(libsvn_swig_perl_OBJECTS) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
  
 -libsvn_swig_py_DEPS = subversion/bindings/swig/swigutil_py.lo subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_delta/libsvn_delta-1.la 
 +libsvn_swig_py_DEPS = subversion/bindings/swig/swigutil_py.lo
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.4 2003/06/18 13:26:26 epg Exp $
  
  libsvn_test_DEPS = subversion/tests/svn_test_editor.lo subversion/tests/svn_tests_main.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la 
  libsvn_test_OBJECTS = svn_test_editor.lo svn_tests_main.lo
-@@ -134,15 +134,15 @@ md5args_OBJECTS = md5args.o
+@@ -139,15 +139,15 @@
  subversion/tests/libsvn_repos/md5args$(EXEEXT): $(md5args_DEPS)
  	cd subversion/tests/libsvn_repos && $(LINK) -o md5args$(EXEEXT) $(md5args_OBJECTS) ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
  
@@ -35,9 +35,9 @@ $NetBSD: patch-aa,v 1.4 2003/06/18 13:26:26 epg Exp $
  
  path_test_DEPS = subversion/tests/libsvn_subr/path-test.o subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la 
  path_test_OBJECTS = path-test.o
-@@ -219,40 +219,40 @@ java_wc_OBJECTS = svn_wc.lo
- subversion/bindings/swig/java/_wc.la: $(java_wc_DEPS)
- 	cd subversion/bindings/swig/java && $(LINK_JAVA_WRAPPER) -o _wc.la $(java_wc_OBJECTS) ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/bindings/swig/libsvn_swig_java-1.la $(LIBS)
+@@ -259,40 +259,40 @@
+ subversion/bindings/swig/perl/_wc.la: $(perl_wc_DEPS)
+ 	cd subversion/bindings/swig/perl && $(LINK_PL_WRAPPER) -o _wc.la $(perl_wc_OBJECTS) ../../../../subversion/libsvn_wc/libsvn_wc-1.la -lswigpl ../../../../subversion/bindings/swig/libsvn_swig_perl-1.la $(LIBS)
  
 -python_client_DEPS = subversion/bindings/swig/python/svn_client.lo subversion/libsvn_client/libsvn_client-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
 +python_client_DEPS = subversion/bindings/swig/python/svn_client.lo subversion/bindings/swig/libsvn_swig_py-1.la 
@@ -88,5 +88,5 @@ $NetBSD: patch-aa,v 1.4 2003/06/18 13:26:26 epg Exp $
 -	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _wc.la $(python_wc_OBJECTS) ../../../../subversion/libsvn_wc/libsvn_wc-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
 +	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _wc.la $(python_wc_OBJECTS) -lsvn_wc-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
  
- svn_DEPS = subversion/clients/cmdline/add-cmd.o subversion/clients/cmdline/cat-cmd.o subversion/clients/cmdline/checkout-cmd.o subversion/clients/cmdline/cleanup-cmd.o subversion/clients/cmdline/commit-cmd.o subversion/clients/cmdline/copy-cmd.o subversion/clients/cmdline/delete-cmd.o subversion/clients/cmdline/diff-cmd.o subversion/clients/cmdline/export-cmd.o subversion/clients/cmdline/feedback.o subversion/clients/cmdline/help-cmd.o subversion/clients/cmdline/import-cmd.o subversion/clients/cmdline/info-cmd.o subversion/clients/cmdline/log-cmd.o subversion/clients/cmdline/ls-cmd.o subversion/clients/cmdline/main.o subversion/clients/cmdline/merge-cmd.o subversion/clients/cmdline/mkdir-cmd.o subversion/clients/cmdline/move-cmd.o subversion/clients/cmdline/prompt.o subversion/clients/cmdline/propdel-cmd.o subversion/clients/cmdline/propedit-cmd.o subversion/clients/cmdline/propget-cmd.o subversion/clients/cmdline/proplist-cmd.o subversion/clients/cmdline/props.o subversion/clients/cmdline/propset-cmd.o subversion/clients/cmdline/resolve-cmd.o subversion/clients/cmdline/revert-cmd.o subversion/clients/cmdline/status-cmd.o subversion/clients/cmdline/status.o subversion/clients/cmdline/switch-cmd.o subversion/clients/cmdline/update-cmd.o subversion/clients/cmdline/util.o subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la 
- svn_OBJECTS = add-cmd.o cat-cmd.o checkout-cmd.o cleanup-cmd.o commit-cmd.o copy-cmd.o delete-cmd.o diff-cmd.o export-cmd.o feedback.o help-cmd.o import-cmd.o info-cmd.o log-cmd.o ls-cmd.o main.o merge-cmd.o mkdir-cmd.o move-cmd.o prompt.o propdel-cmd.o propedit-cmd.o propget-cmd.o proplist-cmd.o props.o propset-cmd.o resolve-cmd.o revert-cmd.o status-cmd.o status.o switch-cmd.o update-cmd.o util.o
+ svn_DEPS = subversion/clients/cmdline/add-cmd.o subversion/clients/cmdline/cat-cmd.o subversion/clients/cmdline/checkout-cmd.o subversion/clients/cmdline/cleanup-cmd.o subversion/clients/cmdline/commit-cmd.o subversion/clients/cmdline/copy-cmd.o subversion/clients/cmdline/delete-cmd.o subversion/clients/cmdline/diff-cmd.o subversion/clients/cmdline/export-cmd.o subversion/clients/cmdline/feedback.o subversion/clients/cmdline/help-cmd.o subversion/clients/cmdline/import-cmd.o subversion/clients/cmdline/info-cmd.o subversion/clients/cmdline/log-cmd.o subversion/clients/cmdline/ls-cmd.o subversion/clients/cmdline/main.o subversion/clients/cmdline/merge-cmd.o subversion/clients/cmdline/mkdir-cmd.o subversion/clients/cmdline/move-cmd.o subversion/clients/cmdline/prompt.o subversion/clients/cmdline/propdel-cmd.o subversion/clients/cmdline/propedit-cmd.o subversion/clients/cmdline/propget-cmd.o subversion/clients/cmdline/proplist-cmd.o subversion/clients/cmdline/props.o subversion/clients/cmdline/propset-cmd.o subversion/clients/cmdline/resolved-cmd.o subversion/clients/cmdline/revert-cmd.o subversion/clients/cmdline/status-cmd.o subversion/clients/cmdline/status.o subversion/clients/cmdline/switch-cmd.o subversion/clients/cmdline/update-cmd.o subversion/clients/cmdline/util.o subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la 
+ svn_OBJECTS = add-cmd.o cat-cmd.o checkout-cmd.o cleanup-cmd.o commit-cmd.o copy-cmd.o delete-cmd.o diff-cmd.o export-cmd.o feedback.o help-cmd.o import-cmd.o info-cmd.o log-cmd.o ls-cmd.o main.o merge-cmd.o mkdir-cmd.o move-cmd.o prompt.o propdel-cmd.o propedit-cmd.o propget-cmd.o proplist-cmd.o props.o propset-cmd.o resolved-cmd.o revert-cmd.o status-cmd.o status.o switch-cmd.o update-cmd.o util.o
diff --git a/devel/subversion/patches/patch-ac b/devel/subversion/patches/patch-ac
index 5d42cb92bb2..01ad85d5f5e 100644
--- a/devel/subversion/patches/patch-ac
+++ b/devel/subversion/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2003/06/06 11:05:02 jmmv Exp $
+$NetBSD: patch-ac,v 1.5 2003/08/15 19:27:45 recht Exp $
 
---- tools/cgi/tweak-log.cgi.orig	Wed Jan 22 02:15:35 2003
-+++ tools/cgi/tweak-log.cgi
-@@ -29,8 +29,8 @@ use CGI qw(:standard);
+--- tools/cgi/tweak-log.cgi.orig	2003-08-14 14:25:11.000000000 +0200
++++ tools/cgi/tweak-log.cgi	2003-08-15 18:05:37.000000000 +0200
+@@ -29,8 +29,8 @@
  ###############################################################################
  # Configuration Section
  
diff --git a/devel/subversion/patches/patch-ad b/devel/subversion/patches/patch-ad
index b9ea196b42c..98bba9875f6 100644
--- a/devel/subversion/patches/patch-ad
+++ b/devel/subversion/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.4 2003/06/18 13:26:26 epg Exp $
+$NetBSD: patch-ad,v 1.5 2003/08/15 19:27:45 recht Exp $
 
---- Makefile.in.orig	Mon Jun 16 08:19:41 2003
-+++ Makefile.in
-@@ -72,8 +72,9 @@ swig_py_libdir = @libdir@
- swig_java_libdir = @libdir@
+--- Makefile.in.orig	2003-08-14 14:21:35.000000000 +0200
++++ Makefile.in	2003-08-15 18:05:39.000000000 +0200
+@@ -74,8 +74,9 @@
+ swig_pl_libdir = @libdir@
  
  ### these possibly need further discussion
 -swig_pydir = @libdir@/svn-python/libsvn
@@ -12,5 +12,5 @@ $NetBSD: patch-ad,v 1.4 2003/06/18 13:26:26 epg Exp $
 +#swig_pydir = @libdir@/svn-python/svn
 +swig_pydir_extra = ${swig_pydir}
  swig_javadir = @libdir@/svn-java
+ swig_pldir = @libdir@/svn-perl
  
- ### should search for these...
diff --git a/devel/subversion/patches/patch-ae b/devel/subversion/patches/patch-ae
index f17809c4d03..4f10e4c6271 100644
--- a/devel/subversion/patches/patch-ae
+++ b/devel/subversion/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2003/06/20 06:45:00 epg Exp $
+$NetBSD: patch-ae,v 1.3 2003/08/15 19:27:45 recht Exp $
 
---- configure.orig	Mon Jun 16 08:28:05 2003
-+++ configure
-@@ -10568,8 +10568,9 @@ echo "$as_me: WARNING: swig bindings req
+--- configure.orig	2003-08-14 14:26:55.000000000 +0200
++++ configure	2003-08-15 18:06:50.000000000 +0200
+@@ -10358,8 +10358,9 @@
      esac
      if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes"; then
        ### TODO: When it's ready, add the swig-java-lib rule here.
@@ -14,7 +14,7 @@ $NetBSD: patch-ae,v 1.2 2003/06/20 06:45:00 epg Exp $
  
        echo "$as_me:$LINENO: checking for swig library directory" >&5
  echo $ECHO_N "checking for swig library directory... $ECHO_C" >&6
-@@ -10735,8 +10736,9 @@ echo "$as_me: WARNING: swig bindings req
+@@ -10535,8 +10536,9 @@
      esac
      if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes"; then
        ### TODO: When it's ready, add the swig-java-lib rule here.
@@ -26,7 +26,7 @@ $NetBSD: patch-ae,v 1.2 2003/06/20 06:45:00 epg Exp $
  
        echo "$as_me:$LINENO: checking for swig library directory" >&5
  echo $ECHO_N "checking for swig library directory... $ECHO_C" >&6
-@@ -10905,8 +10907,9 @@ echo "$as_me: WARNING: swig bindings req
+@@ -10715,8 +10717,9 @@
      esac
      if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes"; then
        ### TODO: When it's ready, add the swig-java-lib rule here.