19476174 upgrade Subversion to 1.7.19
authorStefan Teleman <stefan.teleman@oracle.com>
Thu, 26 Feb 2015 10:02:54 -0800
changeset 3865 10347aa825d2
parent 3864 77a09e73626b
child 3867 e12ff6f7add3
19476174 upgrade Subversion to 1.7.19 19604382 problem in UTILITY/SVN 19925926 "gmake test" failures for subversion 19150241 subversion tests need some love 17063220 Pythia build42: C11 compliance breaks S12-UL/b25 subversion-1.7.5 build 20461158 SVN should have some master test results to compare against
components/subversion/Makefile
components/subversion/patches/000-Makefile.in.patch
components/subversion/patches/001-configure.patch
components/subversion/patches/002-CVE-2013-1849.patch
components/subversion/patches/003-CVE-2013-4505.patch
components/subversion/subversion.p5m
components/subversion/test/results-32.master
components/subversion/test/results-64.master
--- a/components/subversion/Makefile	Thu Feb 26 06:52:41 2015 -0800
+++ b/components/subversion/Makefile	Thu Feb 26 10:02:54 2015 -0800
@@ -28,16 +28,16 @@
 PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
 
 COMPONENT_NAME=		subversion
-COMPONENT_VERSION=	1.7.5
+COMPONENT_VERSION=	1.7.19
 COMPONENT_PROJECT_URL=	http://subversion.apache.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-	sha256:cb102a437335a8921f00cef9bf730d84527713f1a5091e3e1eb2f16402f85dc1
+	sha256:184246bf5ccd0cb31f296b87fdae72617e445901b468529e638b919ca4012d4f
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/subversion/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/svn
 
-TPNO=			9086
+TPNO=			21233
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -57,17 +57,23 @@
 # other way.
 CXX += $(studio_NORUNPATH)
 CFLAGS += -features=extensions
-CFLAGS += -xustr=ascii_utf16_ushort -xcsi
 CXXFLAGS += -features=nestedaccess,tmplife,tmplrefstatic
 CXXFLAGS += -template=geninlinefuncs
-CXXFLAGS += -verbose=template
-CXXFLAGS += -xustr=ascii_utf16_ushort
 CXXFLAGS += $(CC_PIC)
 CXXFLAGS += -mt -D_REENTRANT -DNDEBUG -DSOLARIS
 CXXFLAGS += $(CPP_LARGEFILES)
 CFLAGS += `pkg-config --cflags neon`
 CFLAGS += $(CPP_LARGEFILES)
 
+COMPONENT_TEST_TRANSFORMS += \
+     '-e "/libtool/d"' \
+     '-e "/-m32/d"' \
+     '-e "/-m64/d"' \
+     '-e "s^lib/$(MACH64)^lib/MACH64^g"'  \
+     '-e "s/^make\[[0-9]\{1,\}\]/make/g"' \
+     '-e "/ld: warning/d"' \
+     '-e "/warning/d"'
+
 PERL_VERSION_12 = 5.12
 PERL_VERSION_16 = 5.16
 PERL_ARCH_12_i386 = i86pc-solaris-64int
@@ -76,6 +82,13 @@
 PERL_ARCH_16_sparc = sun4-solaris-64
 PERL_ARCH_12 = $(PERL_ARCH_12_$(MACH))
 PERL_ARCH_16 = $(PERL_ARCH_16_$(MACH))
+APR_VERSION = 1.5
+APR_UTIL_VERSION = 1.5
+SS_VERSION := 12.3
+
+ifneq (, $(findstring 12.4,$(CXX)))
+  SS_VERSION := 12.4
+endif
 
 # Let's write some post-configure hacks
 COMPONENT_POST_CONFIGURE_ACTION = \
@@ -106,12 +119,24 @@
 LIBSVNDIR.32 = $(CONFIGURE_PREFIX)/lib/svn
 LIBSVNDIR.64 = $(CONFIGURE_PREFIX)/lib/svn/$(MACH64)
 
-APR-CONFIG.32 = /usr/apr/1.5/bin/apr-1-config
-APR-CONFIG.64 = /usr/apr/1.5/bin/$(MACH64)/apr-1-config
-APU-CONFIG.32 = /usr/apr-util/1.5/bin/apu-1-config
-APU-CONFIG.64 = /usr/apr-util/1.5/bin/$(MACH64)/apu-1-config
+APR-CONFIG.32 = /usr/apr/$(APR_VERSION)/bin/apr-1-config
+APR-CONFIG.64 = /usr/apr/$(APR_VERSION)/bin/$(MACH64)/apr-1-config
+APU-CONFIG.32 = /usr/apr-util/$(APR_UTIL_VERSION)/bin/apu-1-config
+APU-CONFIG.64 = /usr/apr-util/$(APR_UTIL_VERSION)/bin/$(MACH64)/apu-1-config
 APXS.32 = /usr/apache2/2.2/bin/apxs
-APXS.64 = /usr/apache2/2.2/bin/$(MACH64)/apxs
+APXS.64 = /usr/apache2/2.4/bin/apxs
+APR-CONFIG-RPATH.32 = /usr/apr/$(APR_VERSION)/lib
+APR-CONFIG-RPATH.64 = /usr/apr/$(APR_VERSION)/lib/$(MACH64)
+APU-CONFIG-RPATH.32 = /usr/apr-util/$(APR_VERSION)/lib
+APU-CONFIG-RPATH.64 = /usr/apr-util/$(APR_VERSION)/lib/$(MACH64)
+APACHE_LIBEXECDIR.32 = `$(APXS.32) -q libexecdir`
+APACHE_LIBEXECDIR.64 = `$(APXS.64) -q libexecdir`
+
+LDFLAGS += -R$(LIBSVNDIR.$(BITS)) -R$(APR-CONFIG-RPATH.$(BITS)) \
+	   -R$(APU-CONFIG-RPATH.$(BITS))
+
+CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)"
+CONFIGURE_ENV += RUBY="$(RUBY.1.9)"
 
 # Let's make noise just because we have to override --libdir
 CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX)
@@ -125,12 +150,12 @@
 CONFIGURE_OPTIONS += --disable-libtool-lock 
 CONFIGURE_OPTIONS += --disable-neon-version-check
 CONFIGURE_OPTIONS += --disable-experimental-libtool
-CONFIGURE_OPTIONS += --with-apxs=/usr/apache2/2.2/bin/apxs
+CONFIGURE_OPTIONS += --with-apxs=$(APXS.$(BITS))
 CONFIGURE_OPTIONS += --with-ssl 
 CONFIGURE_OPTIONS += --with-zlib=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS += --with-jdk=$(JAVA_ROOT)
-CONFIGURE_OPTIONS += --with-apr=/usr/apr/1.5
-CONFIGURE_OPTIONS += --with-apr-util=/usr/apr-util/1.5
+CONFIGURE_OPTIONS += --with-apr=/usr/apr/$(APR_VERSION)
+CONFIGURE_OPTIONS += --with-apr-util=/usr/apr-util/$(APR_UTIL_VERSION)
 CONFIGURE_OPTIONS += --enable-nls
 CONFIGURE_OPTIONS += --disable-mod-activation
 CONFIGURE_OPTIONS += --enable-javahl
@@ -138,7 +163,6 @@
 CONFIGURE_OPTIONS += --with-neon=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS += --with-apr=$(APR-CONFIG.$(BITS))
 CONFIGURE_OPTIONS += --with-apr-util=$(APU-CONFIG.$(BITS))
-CONFIGURE_OPTIONS += --with-apxs=$(APXS.$(BITS))
 CONFIGURE_OPTIONS += --with-gssapi=$(CONFIGURE_PREFIX)
 
 # Swig overwrites the 32-bit directory with 64-bit objects.
@@ -168,7 +192,6 @@
 
 test:		$(TEST_32_and_64)
 
-
 REQUIRED_PACKAGES += database/sqlite-3
 REQUIRED_PACKAGES += developer/versioning/subversion
 REQUIRED_PACKAGES += library/apr-15
--- a/components/subversion/patches/000-Makefile.in.patch	Thu Feb 26 06:52:41 2015 -0800
+++ b/components/subversion/patches/000-Makefile.in.patch	Thu Feb 26 10:02:54 2015 -0800
@@ -1,3 +1,6 @@
+# Internal patch.
+# Our Python installation uses additional directories.
+# Various fixes for correctly recording the RUNPATH|RPATH in shared objects.
 --- Makefile.in	2011-07-16 04:50:53.000000000 -0700
 +++ Makefile.in	2013-03-21 09:03:57.096238407 -0700
 @@ -85,8 +85,8 @@
--- a/components/subversion/patches/001-configure.patch	Thu Feb 26 06:52:41 2015 -0800
+++ b/components/subversion/patches/001-configure.patch	Thu Feb 26 10:02:54 2015 -0800
@@ -1,5 +1,9 @@
---- configure	2012-05-10 11:52:02.000000000 -0700
-+++ configure	2013-03-20 14:20:04.139519952 -0700
+# Internal patch.
+# apr-config and apu-config use the wrong options
+# neon library pkg-config should not print the library path
+# Our Kerberos installation is not 100% compatible with MIT-Kerberos
+--- configure	2014-12-08 23:32:25.000000000 -0800
++++ configure	2015-01-20 10:36:42.439487008 -0800
 @@ -4686,14 +4686,14 @@
    fi
  
@@ -12,7 +16,7 @@
      fi
    else
 -    SVN_APR_LIBS="`$apr_config --link-ld`"
-+    SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
++    SVN_APR_LIBS="`$apr_config --link-libtool`"
      if test $? -ne 0; then
 -      as_fn_error $? "apr-config --link-ld failed" "$LINENO" 5
 +      as_fn_error $? "apr-config --link-libtool failed" "$LINENO" 5
@@ -31,10 +35,10 @@
      fi
    else
 -    SVN_APRUTIL_LIBS="`$apu_config --link-ld`"
-+    SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
++    SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
      if test $? -ne 0; then
 -      as_fn_error $? "apu-config --link-ld failed" "$LINENO" 5
-+      as_fn_error $? "apu-config --link-libtool --libs failed" "$LINENO" 5
++      as_fn_error $? "apu-config --link-libtool failed" "$LINENO" 5
      fi
    fi
    SVN_APRUTIL_LIBS="`
@@ -51,8 +55,8 @@
      conftest$ac_exeext conftest.$ac_ext
                if test "$shared_linking" = "no"; then
                  NEON_LIBS=`$PKG_CONFIG neon --libs --static`
-+		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
-+		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
++                NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++                NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
                  LIBS="$LIBS $NEON_LIBS"
                  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -60,8 +64,8 @@
                old_CFLAGS="$CFLAGS"
                old_LIBS="$LIBS"
                NEON_LIBS=`$PKG_CONFIG neon --libs`
-+	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
-+	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
++              NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++              NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
                CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
                LIBS="$LIBS $NEON_LIBS"
                neon_test_code="
@@ -69,35 +73,25 @@
      conftest$ac_exeext conftest.$ac_ext
                if test "$shared_linking" = "no"; then
                  NEON_LIBS=`$PKG_CONFIG neon --libs --static`
-+		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
-+		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
++                NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++                NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
                  LIBS="$LIBS $NEON_LIBS"
                  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
[email protected]@ -5520,6 +5528,8 @@
-               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`
-+	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
-+	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
-             fi
-             svn_lib_neon="yes"
-             break
[email protected]@ -5576,8 +5586,9 @@
[email protected]@ -5576,9 +5584,9 @@
  fi
  
  
 -
 -
+-
 +NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
 +NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
 +export NEON_LIBS
  
+ if test "$svn_lib_neon" = "yes"; then
  
- if test "$svn_lib_neon" = "yes"; then
---- configure	2013-07-29 12:50:28.716771506 -0700
-+++ configure	2013-07-29 13:04:59.668934315 -0700
[email protected]@ -6098,8 +6098,8 @@
[email protected]@ -6106,11 +6114,11 @@
        old_CFLAGS="$CFLAGS"
        old_LIBS="$LIBS"
        CFLAGS=""
@@ -105,6 +99,11 @@
 -      SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`"
 +      SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5"
 +      SVN_GSSAPI_LIBS="-lgss"
-       SVN_GSSAPI_LIBS="`
-   input_flags="$SVN_GSSAPI_LIBS"
-   output_flags=""
+       if test $? -ne 0; then
+-                                SVN_GSSAPI_INCLUDES="$SVN_GSSAPI_INCLUDES -I/usr/include/gssapi"
+-        SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs krb5` -lgss"
++        SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5"
++        SVN_GSSAPI_LIBS="-lgss"
+         if test $? -ne 0; then
+                     as_fn_error $? "krb5-config returned an error" "$LINENO" 5
+         fi
--- a/components/subversion/patches/002-CVE-2013-1849.patch	Thu Feb 26 06:52:41 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# CVE-2013-1849
-# http://subversion.apache.org/security/CVE-2013-1849-advisory.txt
-
---- subversion/mod_dav_svn/liveprops.c	2012-02-03 12:04:00.000000000 -0800
-+++ subversion/mod_dav_svn/liveprops.c	2014-01-22 09:29:53.399158026 -0800
[email protected]@ -429,7 +429,8 @@
-         svn_filesize_t len = 0;
- 
-         /* our property, but not defined on collection resources */
--        if (resource->collection || resource->baselined)
-+        if (resource->type == DAV_RESOURCE_TYPE_ACTIVITY ||
-+            resource->collection || resource->baselined)
-           return DAV_PROP_INSERT_NOTSUPP;
- 
-         serr = svn_fs_file_length(&len, resource->info->root.root,
[email protected]@ -453,7 +454,9 @@
-         svn_string_t *pval;
-         const char *mime_type = NULL;
- 
--        if (resource->baselined && resource->type == DAV_RESOURCE_TYPE_VERSION)
-+        if ((resource->type == DAV_RESOURCE_TYPE_ACTIVITY) ||
-+            (resource->baselined &&
-+             resource->type == DAV_RESOURCE_TYPE_VERSION))
-           return DAV_PROP_INSERT_NOTSUPP;
- 
-         if (resource->type == DAV_RESOURCE_TYPE_PRIVATE
--- a/components/subversion/patches/003-CVE-2013-4505.patch	Thu Feb 26 06:52:41 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-# CVE-2013-4505
-# http://subversion.apache.org/security/CVE-2013-4505-advisory.txt
-
---- tools/server-side/mod_dontdothat/mod_dontdothat.c	2011-11-28 12:02:41.000000000 -0800
-+++ tools/server-side/mod_dontdothat/mod_dontdothat.c	2014-01-29 06:58:46.573510739 -0800
[email protected]@ -30,12 +30,14 @@
- #include <util_filter.h>
- #include <ap_config.h>
- #include <apr_strings.h>
-+#include <apr_uri.h>
- 
- #include <expat.h>
- 
- #include "mod_dav_svn.h"
- #include "svn_string.h"
- #include "svn_config.h"
-+#include "private/svn_fspath.h"
- 
- module AP_MODULE_DECLARE_DATA dontdothat_module;
- 
[email protected]@ -161,26 +163,71 @@
-     }
- }
- 
-+/* duplicate of dav_svn__log_err() from mod_dav_svn/util.c */
-+static void
-+log_dav_err(request_rec *r,
-+                dav_error *err,
-+                int level)
-+{
-+  dav_error *errscan;
-+
-+  /* Log the errors */
-+  /* ### should have a directive to log the first or all */
-+  for (errscan = err; errscan != NULL; errscan = errscan->prev) {
-+    apr_status_t status;
-+
-+    if (errscan->desc == NULL)
-+      continue;
-+
-+#if AP_MODULE_MAGIC_AT_LEAST(20091119,0)
-+    status = errscan->aprerr;
-+#else
-+    status = errscan->save_errno;
-+#endif
-+
-+    ap_log_rerror(APLOG_MARK, level, status, r,
-+        "%s  [%d, #%d]",
-+        errscan->desc, errscan->status, errscan->error_id);
-+  }
-+}
-+
- static svn_boolean_t
- is_this_legal(dontdothat_filter_ctx *ctx, const char *uri)
- {
-   const char *relative_path;
-   const char *cleaned_uri;
-   const char *repos_name;
-+  const char *uri_path;
-   int trailing_slash;
-   dav_error *derr;
- 
--  /* Ok, so we need to skip past the scheme, host, etc. */
--  uri = ap_strstr_c(uri, "://");
--  if (uri)
--    uri = ap_strchr_c(uri + 3, '/');
-+  /* uri can be an absolute uri or just a path, we only want the path to match
-+   * against */
-+  if (uri && svn_path_is_url(uri))
-+  {
-+    apr_uri_t parsed_uri;
-+    apr_status_t rv = apr_uri_parse(ctx->r->pool, uri, &parsed_uri);
-+    if (APR_SUCCESS != rv)
-+    {
-+      /* Error parsing the URI, log and reject request. */
-+      ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, ctx->r,
-+          "mod_dontdothat: blocked request after failing "
-+          "to parse uri: '%s'", uri);
-+      return FALSE;
-+    }
-+    uri_path = parsed_uri.path;
-+  }
-+  else
-+  {
-+    uri_path = uri;
-+  }
- 
--  if (uri)
-+  if (uri_path)
-     {
-       const char *repos_path;
- 
-       derr = dav_svn_split_uri(ctx->r,
--                               uri,
-+                               uri_path,
-                                ctx->cfg->base_path,
-                                &cleaned_uri,
-                                &trailing_slash,
[email protected]@ -194,7 +241,7 @@
-           if (! repos_path)
-             repos_path = "";
- 
--          repos_path = apr_psprintf(ctx->r->pool, "/%s", repos_path);
-+          repos_path = svn_fspath__canonicalize(repos_path, ctx->r->pool);
- 
-           /* First check the special cases that are always legal... */
-           for (idx = 0; idx < ctx->allow_recursive_ops->nelts; ++idx)
[email protected]@ -228,6 +275,18 @@
-                 }
-             }
-         }
-+      else
-+      {
-+        log_dav_err(ctx->r, derr, APLOG_ERR);
-+        return FALSE;
-+      }
-+    }
-+  else
-+  {
-+    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r,
-+        "mod_dontdothat: empty uri passed to is_this_legal(), "
-+        "module bug?");
-+    return FALSE;
-     }
- 
-   return TRUE;
-
--- a/components/subversion/subversion.p5m	Thu Feb 26 06:52:41 2015 -0800
+++ b/components/subversion/subversion.p5m	Thu Feb 26 10:02:54 2015 -0800
@@ -18,17 +18,21 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file  path=usr/include/svn/(.+)$ -> \
     set action.hash usr/include/subversion-1/%<\1> >
+
+# prevents "64bit file in 32bit path" errors
+<transform file path=usr/apache2/2.4/libexec/.*\.so -> \
+    add pkg.linted.userland.action001.2 true>
 set name=pkg.fmri \
     value=pkg:/developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Subversion source code management system"
 set name=pkg.description \
     value="A full-featured version control and source code management system designed to be a better CVS"
-#
+
 # This package name has known conflicts with other packages in the WOS
 set name=pkg.linted.pkglint.manifest004 value=true
 set name=com.oracle.info.description \
@@ -40,14 +44,12 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2006/563
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/apache2/2.2/libexec/$(MACH64)/mod_authz_svn.so
-file path=usr/apache2/2.2/libexec/$(MACH64)/mod_dav_svn.so
-file path=usr/apache2/2.2/libexec/$(MACH64)/mod_dontdothat.so
-
-#
 file path=usr/apache2/2.2/libexec/mod_authz_svn.so
 file path=usr/apache2/2.2/libexec/mod_dav_svn.so
 file path=usr/apache2/2.2/libexec/mod_dontdothat.so
+file path=usr/apache2/2.4/libexec/mod_authz_svn.so
+file path=usr/apache2/2.4/libexec/mod_dav_svn.so
+file path=usr/apache2/2.4/libexec/mod_dontdothat.so
 file usr/bin/$(MACH64)/svn path=usr/bin/svn
 file usr/bin/$(MACH64)/svnadmin path=usr/bin/svnadmin
 file usr/bin/$(MACH64)/svndumpfilter path=usr/bin/svndumpfilter
@@ -56,48 +58,52 @@
 file usr/bin/$(MACH64)/svnserve path=usr/bin/svnserve
 file usr/bin/$(MACH64)/svnsync path=usr/bin/svnsync
 file usr/bin/$(MACH64)/svnversion path=usr/bin/svnversion
-file path=usr/include/svn/mod_authz_svn.h
-file path=usr/include/svn/mod_dav_svn.h
-file path=usr/include/svn/svn_auth.h
-file path=usr/include/svn/svn_base64.h
-file path=usr/include/svn/svn_checksum.h
-file path=usr/include/svn/svn_client.h
-file path=usr/include/svn/svn_cmdline.h
-file path=usr/include/svn/svn_compat.h
-file path=usr/include/svn/svn_config.h
-file path=usr/include/svn/svn_ctype.h
-file path=usr/include/svn/svn_dav.h
-file path=usr/include/svn/svn_delta.h
-file path=usr/include/svn/svn_diff.h
-file path=usr/include/svn/svn_dirent_uri.h
-file path=usr/include/svn/svn_dso.h
-file path=usr/include/svn/svn_error.h
-file path=usr/include/svn/svn_error_codes.h
-file path=usr/include/svn/svn_fs.h
-file path=usr/include/svn/svn_hash.h
-file path=usr/include/svn/svn_io.h
-file path=usr/include/svn/svn_iter.h
-file path=usr/include/svn/svn_md5.h
-file path=usr/include/svn/svn_mergeinfo.h
-file path=usr/include/svn/svn_nls.h
-file path=usr/include/svn/svn_opt.h
-file path=usr/include/svn/svn_path.h
-file path=usr/include/svn/svn_pools.h
-file path=usr/include/svn/svn_props.h
-file path=usr/include/svn/svn_quoprint.h
-file path=usr/include/svn/svn_ra.h
-file path=usr/include/svn/svn_ra_svn.h
-file path=usr/include/svn/svn_repos.h
-file path=usr/include/svn/svn_sorts.h
-file path=usr/include/svn/svn_string.h
-file path=usr/include/svn/svn_subst.h
-file path=usr/include/svn/svn_time.h
-file path=usr/include/svn/svn_types.h
-file path=usr/include/svn/svn_user.h
-file path=usr/include/svn/svn_utf.h
-file path=usr/include/svn/svn_version.h
-file path=usr/include/svn/svn_wc.h
-file path=usr/include/svn/svn_xml.h
+file usr/include/subversion-1/mod_dav_svn.h path=usr/include/svn/mod_dav_svn.h
+file usr/include/subversion-1/svn_auth.h path=usr/include/svn/svn_auth.h
+file usr/include/subversion-1/svn_base64.h path=usr/include/svn/svn_base64.h
+file usr/include/subversion-1/svn_cache_config.h \
+    path=usr/include/svn/svn_cache_config.h
+file usr/include/subversion-1/svn_checksum.h path=usr/include/svn/svn_checksum.h
+file usr/include/subversion-1/svn_client.h path=usr/include/svn/svn_client.h
+file usr/include/subversion-1/svn_cmdline.h path=usr/include/svn/svn_cmdline.h
+file usr/include/subversion-1/svn_compat.h path=usr/include/svn/svn_compat.h
+file usr/include/subversion-1/svn_config.h path=usr/include/svn/svn_config.h
+file usr/include/subversion-1/svn_ctype.h path=usr/include/svn/svn_ctype.h
+file usr/include/subversion-1/svn_dav.h path=usr/include/svn/svn_dav.h
+file usr/include/subversion-1/svn_delta.h path=usr/include/svn/svn_delta.h
+file usr/include/subversion-1/svn_diff.h path=usr/include/svn/svn_diff.h
+file usr/include/subversion-1/svn_dirent_uri.h \
+    path=usr/include/svn/svn_dirent_uri.h
+file usr/include/subversion-1/svn_dso.h path=usr/include/svn/svn_dso.h
+file usr/include/subversion-1/svn_error.h path=usr/include/svn/svn_error.h
+file usr/include/subversion-1/svn_error_codes.h \
+    path=usr/include/svn/svn_error_codes.h
+file usr/include/subversion-1/svn_fs.h path=usr/include/svn/svn_fs.h
+file usr/include/subversion-1/svn_hash.h path=usr/include/svn/svn_hash.h
+file usr/include/subversion-1/svn_io.h path=usr/include/svn/svn_io.h
+file usr/include/subversion-1/svn_iter.h path=usr/include/svn/svn_iter.h
+file usr/include/subversion-1/svn_md5.h path=usr/include/svn/svn_md5.h
+file usr/include/subversion-1/svn_mergeinfo.h \
+    path=usr/include/svn/svn_mergeinfo.h
+file usr/include/subversion-1/svn_nls.h path=usr/include/svn/svn_nls.h
+file usr/include/subversion-1/svn_opt.h path=usr/include/svn/svn_opt.h
+file usr/include/subversion-1/svn_path.h path=usr/include/svn/svn_path.h
+file usr/include/subversion-1/svn_pools.h path=usr/include/svn/svn_pools.h
+file usr/include/subversion-1/svn_props.h path=usr/include/svn/svn_props.h
+file usr/include/subversion-1/svn_quoprint.h path=usr/include/svn/svn_quoprint.h
+file usr/include/subversion-1/svn_ra.h path=usr/include/svn/svn_ra.h
+file usr/include/subversion-1/svn_ra_svn.h path=usr/include/svn/svn_ra_svn.h
+file usr/include/subversion-1/svn_repos.h path=usr/include/svn/svn_repos.h
+file usr/include/subversion-1/svn_sorts.h path=usr/include/svn/svn_sorts.h
+file usr/include/subversion-1/svn_string.h path=usr/include/svn/svn_string.h
+file usr/include/subversion-1/svn_subst.h path=usr/include/svn/svn_subst.h
+file usr/include/subversion-1/svn_time.h path=usr/include/svn/svn_time.h
+file usr/include/subversion-1/svn_types.h path=usr/include/svn/svn_types.h
+file usr/include/subversion-1/svn_user.h path=usr/include/svn/svn_user.h
+file usr/include/subversion-1/svn_utf.h path=usr/include/svn/svn_utf.h
+file usr/include/subversion-1/svn_version.h path=usr/include/svn/svn_version.h
+file usr/include/subversion-1/svn_wc.h path=usr/include/svn/svn_wc.h
+file usr/include/subversion-1/svn_xml.h path=usr/include/svn/svn_xml.h
 link path=usr/lib/svn/$(MACH64)/libsvn_client-1.so \
     target=libsvn_client-1.so.0.0.0
 link path=usr/lib/svn/$(MACH64)/libsvn_client-1.so.0 \
@@ -211,5 +217,5 @@
 file path=usr/share/man/man1/svnversion.1
 file path=usr/share/man/man5/svnserve.conf.5
 file path=usr/share/man/man8/svnserve.8
-#
 license subversion.license license="Apache v2.0"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/subversion/test/results-32.master	Thu Feb 26 10:02:54 2015 -0800
@@ -0,0 +1,161 @@
+make: Entering directory `$(@D)'
+Running tests in auth-test [1/84].............................success
+Running tests in cache-test [2/84]............................success
+Running tests in checksum-test [3/84].........................success
+Running tests in client-test [4/84]...........................success
+Running tests in compat-test [5/84]...........................success
+Running tests in config-test [6/84]...........................success
+Running tests in db-test [7/84]...............................success
+Running tests in diff-diff3-test [8/84].......................success
+Running tests in dirent_uri-test [9/84].......................success
+Running tests in entries-compat-test [10/84]..................success
+Running tests in error-test [11/84]...........................success
+Running tests in fs-pack-test [12/84].........................success
+Running tests in fs-test [13/84]..............................success
+Running tests in hashdump-test [14/84]........................success
+Running tests in locks-test [15/84]...........................success
+Running tests in mergeinfo-test [16/84].......................success
+Running tests in op-depth-test [17/84]........................success
+Running tests in opt-test [18/84].............................success
+Running tests in parse-diff-test [19/84]......................success
+Running tests in path-test [20/84]............................success
+Running tests in pristine-store-test [21/84]..................success
+Running tests in ra-local-test [22/84]........................success
+Running tests in random-test [23/84]..........................success
+Running tests in repos-test [24/84]...........................success
+Running tests in revision-test [25/84]........................success
+Running tests in skel-test [26/84]............................success
+Running tests in stream-test [27/84]..........................success
+Running tests in string-test [28/84]..........................success
+Running tests in subst_translate-test [29/84].................success
+Running tests in target-test [30/84]..........................success
+Running tests in time-test [31/84]............................success
+Running tests in translate-test [32/84].......................success
+Running tests in tree-conflict-data-test [33/84]..............success
+Running tests in utf-test [34/84].............................success
+Running tests in window-test [35/84]..........................success
+Running tests in authz_tests.py [36/84].......................success
+Running tests in autoprop_tests.py [37/84]....................success
+Running tests in basic_tests.py [38/84].......................success
+Running tests in blame_tests.py [39/84].......................success
+Running tests in cat_tests.py [40/84].........................success
+Running tests in changelist_tests.py [41/84]..................success
+Running tests in checkout_tests.py [42/84]....................success
+Running tests in commit_tests.py [43/84]......................success
+Running tests in copy_tests.py [44/84]........................success
+Running tests in depth_tests.py [45/84].......................success
+Running tests in diff_tests.py [46/84]........................success
+Running tests in entries_tests.py [47/84].....................success
+Running tests in export_tests.py [48/84]......................success
+Running tests in externals_tests.py [49/84]...................success
+Running tests in getopt_tests.py [50/84]......................success
+Running tests in history_tests.py [51/84].....................success
+Running tests in import_tests.py [52/84]......................success
+Running tests in info_tests.py [53/84]........................success
+Running tests in input_validation_tests.py [54/84]............success
+Running tests in lock_tests.py [55/84]........................success
+Running tests in log_tests.py [56/84].........................success
+Running tests in merge_authz_tests.py [57/84].................success
+Running tests in merge_reintegrate_tests.py [58/84]...........success
+Running tests in merge_tests.py [59/84].......................success
+Running tests in merge_tree_conflict_tests.py [60/84].........success
+Running tests in mergeinfo_tests.py [61/84]...................success
+Running tests in patch_tests.py [62/84].......................success
+Running tests in prop_tests.py [63/84]........................success
+Running tests in redirect_tests.py [64/84]....................success
+Running tests in relocate_tests.py [65/84]....................success
+Running tests in resolve_tests.py [66/84].....................success
+Running tests in resolved_tests.py [67/84]....................success
+Running tests in revert_tests.py [68/84]......................success
+Running tests in schedule_tests.py [69/84]....................success
+Running tests in special_tests.py [70/84].....................success
+Running tests in stat_tests.py [71/84]........................success
+Running tests in svnadmin_tests.py [72/84]....................success
+Running tests in svndumpfilter_tests.py [73/84]...............success
+Running tests in svnlook_tests.py [74/84].....................success
+Running tests in svnmucc_tests.py [75/84].....................success
+Running tests in svnrdump_tests.py [76/84]....................success
+Running tests in svnsync_tests.py [77/84].....................success
+Running tests in svnversion_tests.py [78/84]..................success
+Running tests in switch_tests.py [79/84]......................success
+Running tests in trans_tests.py [80/84].......................success
+Running tests in tree_conflict_tests.py [81/84]...............success
+Running tests in update_tests.py [82/84]......................success
+Running tests in upgrade_tests.py [83/84].....................success
+Running tests in utf8_tests.py [84/84]........................success
+At least one test was SKIPPED, checking $(@D)/tests.log
+SKIP:  cache-test 2: basic memcache svn_cache test
+SKIP:  cache-test 3: memcache svn_cache with very long keys
+SKIP:  pristine-store-test 3: reject_mismatching_text
+SKIP:  authz_tests.py 1: authz issue #2486 - open root
+SKIP:  authz_tests.py 2: authz issue #2486 - open directory
+SKIP:  authz_tests.py 3: broken authz files cause errors
+SKIP:  authz_tests.py 4: test authz for read operations
+SKIP:  authz_tests.py 5: test authz for write operations
+SKIP:  authz_tests.py 6: test authz for checkout
+SKIP:  authz_tests.py 7: test authz for log and tracing path changes
+SKIP:  authz_tests.py 8: test authz for checkout and update
+SKIP:  authz_tests.py 9: test authz for export with unreadable subfolder
+SKIP:  authz_tests.py 10: test authz for aliases
+SKIP:  authz_tests.py 11: test the authz validation rules
+SKIP:  authz_tests.py 12: test authz for locking
+SKIP:  authz_tests.py 13: authz issue #2712
+SKIP:  authz_tests.py 14: switched to directory, no read access on parents
+SKIP:  authz_tests.py 15: authz issue #3242 - access required at repo root
+SKIP:  authz_tests.py 16: more authz issue #3242 - update to renamed file
+SKIP:  authz_tests.py 17: multiple lines matching a user
+SKIP:  authz_tests.py 18: wc-to-wc-copy with absent nodes and then revert
+SKIP:  authz_tests.py 19: recursive ls with private subtrees
+SKIP:  authz_tests.py 20: authz issue #3781, check case sensitiveness
+SKIP:  authz_tests.py 21: authz should notice a tree conflict
+SKIP:  authz_tests.py 22: wc delete with absent nodes
+SKIP:  authz_tests.py 23: verify commit error reporting
+SKIP:  authz_tests.py 24: upgrade absent nodes to server-excluded
+SKIP:  authz_tests.py 25: delete file without rights on the root
+SKIP:  basic_tests.py 51: verify that neon/serf are compiled if tested
+SKIP:  checkout_tests.py 14: checkout from the root of a Windows drive
+SKIP:  merge_authz_tests.py 1: skipped paths get overriding mergeinfo
+SKIP:  merge_authz_tests.py 3: reintegrate fails if no root access
+SKIP:  redirect_tests.py 1: temporary redirect should error out
+SKIP:  redirect_tests.py 2: redirected checkout
+SKIP:  redirect_tests.py 3: redirected update
+SKIP:  svnsync_tests.py 14: verify that unreadable content is not synced
+SKIP:  svnsync_tests.py 15: verify that copies from unreadable dirs work
+SKIP:  svnsync_tests.py 16: verify copies with mods from unreadable dirs
+SKIP:  svnsync_tests.py 17: verify copies with mods from unreadable dirs +copy
+SKIP:  svnsync_tests.py 32: verify if specifically denied paths dont sync
+SKIP:  svnsync_tests.py 36: copy, then rm at-src-unreadable child
+SKIP:  update_tests.py 24: update a nested wc in a read-only wc
+SKIP:  update_tests.py 32: update wc on the root of a Windows (virtual) drive
+SKIP:  update_tests.py 59: access denied paths should be skipped
+SKIP:  utf8_tests.py 1: conversion of paths and logs to/from utf8
+At least one test XFAILED, checking $(@D)/tests.log
+XFAIL: dirent_uri-test 49: test match with RFC 6125 s. 6.4.3 Rule 3
+XFAIL: fs-test 18: merging commit
+       [[needs to be written to match new merge() algorithm expectations]]
+XFAIL: blame_tests.py 15: blame -g handles changes from empty mergeinfo
+XFAIL: copy_tests.py 103: copy and move conflicts
+XFAIL: diff_tests.py 49: diff URL against working copy with local mods
+XFAIL: export_tests.py 11: export working copy at base revision
+XFAIL: merge_tests.py 49: avoid repeated merges for cyclic merging
+XFAIL: merge_tests.py 64: merge target with non inheritable mergeinfo
+XFAIL: merge_tests.py 114: don't inherit bogus mergeinfo
+XFAIL: merge_tests.py 115: don't inherit bogus working mergeinfo
+XFAIL: merge_tree_conflict_tests.py 12: tree conflicts 5.1: leaf edit, tree del
+XFAIL: merge_tree_conflict_tests.py 13: tree conflicts 5.2: leaf del, tree del
+XFAIL: merge_tree_conflict_tests.py 18: tree conflicts 5.2: leaf del (no ci), tree del
+XFAIL: merge_tree_conflict_tests.py 23: replace vs. delete tree-conflicts
+XFAIL: resolve_tests.py 2: resolving prop conflicts
+XFAIL: revert_tests.py 4: revert a moved file
+XFAIL: revert_tests.py 25: revert a copy with depth=files
+XFAIL: revert_tests.py 26: revert a nested add with depth=immediates
+XFAIL: special_tests.py 18: merge symlink-add from foreign repos
+XFAIL: switch_tests.py 9: switch a file to a dir and back to the file
+XFAIL: tree_conflict_tests.py 14: merge dir: del/rpl/mv onto not-same
+Summary of test results:
+  1583 tests PASSED
+  45 tests SKIPPED
+  21 tests XFAILED (1 WORK-IN-PROGRESS)
+SUMMARY: All tests successful.
+
+make: Leaving directory `$(@D)'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/subversion/test/results-64.master	Thu Feb 26 10:02:54 2015 -0800
@@ -0,0 +1,161 @@
+make: Entering directory `$(@D)'
+Running tests in auth-test [1/84].............................success
+Running tests in cache-test [2/84]............................success
+Running tests in checksum-test [3/84].........................success
+Running tests in client-test [4/84]...........................success
+Running tests in compat-test [5/84]...........................success
+Running tests in config-test [6/84]...........................success
+Running tests in db-test [7/84]...............................success
+Running tests in diff-diff3-test [8/84].......................success
+Running tests in dirent_uri-test [9/84].......................success
+Running tests in entries-compat-test [10/84]..................success
+Running tests in error-test [11/84]...........................success
+Running tests in fs-pack-test [12/84].........................success
+Running tests in fs-test [13/84]..............................success
+Running tests in hashdump-test [14/84]........................success
+Running tests in locks-test [15/84]...........................success
+Running tests in mergeinfo-test [16/84].......................success
+Running tests in op-depth-test [17/84]........................success
+Running tests in opt-test [18/84].............................success
+Running tests in parse-diff-test [19/84]......................success
+Running tests in path-test [20/84]............................success
+Running tests in pristine-store-test [21/84]..................success
+Running tests in ra-local-test [22/84]........................success
+Running tests in random-test [23/84]..........................success
+Running tests in repos-test [24/84]...........................success
+Running tests in revision-test [25/84]........................success
+Running tests in skel-test [26/84]............................success
+Running tests in stream-test [27/84]..........................success
+Running tests in string-test [28/84]..........................success
+Running tests in subst_translate-test [29/84].................success
+Running tests in target-test [30/84]..........................success
+Running tests in time-test [31/84]............................success
+Running tests in translate-test [32/84].......................success
+Running tests in tree-conflict-data-test [33/84]..............success
+Running tests in utf-test [34/84].............................success
+Running tests in window-test [35/84]..........................success
+Running tests in authz_tests.py [36/84].......................success
+Running tests in autoprop_tests.py [37/84]....................success
+Running tests in basic_tests.py [38/84].......................success
+Running tests in blame_tests.py [39/84].......................success
+Running tests in cat_tests.py [40/84].........................success
+Running tests in changelist_tests.py [41/84]..................success
+Running tests in checkout_tests.py [42/84]....................success
+Running tests in commit_tests.py [43/84]......................success
+Running tests in copy_tests.py [44/84]........................success
+Running tests in depth_tests.py [45/84].......................success
+Running tests in diff_tests.py [46/84]........................success
+Running tests in entries_tests.py [47/84].....................success
+Running tests in export_tests.py [48/84]......................success
+Running tests in externals_tests.py [49/84]...................success
+Running tests in getopt_tests.py [50/84]......................success
+Running tests in history_tests.py [51/84].....................success
+Running tests in import_tests.py [52/84]......................success
+Running tests in info_tests.py [53/84]........................success
+Running tests in input_validation_tests.py [54/84]............success
+Running tests in lock_tests.py [55/84]........................success
+Running tests in log_tests.py [56/84].........................success
+Running tests in merge_authz_tests.py [57/84].................success
+Running tests in merge_reintegrate_tests.py [58/84]...........success
+Running tests in merge_tests.py [59/84].......................success
+Running tests in merge_tree_conflict_tests.py [60/84].........success
+Running tests in mergeinfo_tests.py [61/84]...................success
+Running tests in patch_tests.py [62/84].......................success
+Running tests in prop_tests.py [63/84]........................success
+Running tests in redirect_tests.py [64/84]....................success
+Running tests in relocate_tests.py [65/84]....................success
+Running tests in resolve_tests.py [66/84].....................success
+Running tests in resolved_tests.py [67/84]....................success
+Running tests in revert_tests.py [68/84]......................success
+Running tests in schedule_tests.py [69/84]....................success
+Running tests in special_tests.py [70/84].....................success
+Running tests in stat_tests.py [71/84]........................success
+Running tests in svnadmin_tests.py [72/84]....................success
+Running tests in svndumpfilter_tests.py [73/84]...............success
+Running tests in svnlook_tests.py [74/84].....................success
+Running tests in svnmucc_tests.py [75/84].....................success
+Running tests in svnrdump_tests.py [76/84]....................success
+Running tests in svnsync_tests.py [77/84].....................success
+Running tests in svnversion_tests.py [78/84]..................success
+Running tests in switch_tests.py [79/84]......................success
+Running tests in trans_tests.py [80/84].......................success
+Running tests in tree_conflict_tests.py [81/84]...............success
+Running tests in update_tests.py [82/84]......................success
+Running tests in upgrade_tests.py [83/84].....................success
+Running tests in utf8_tests.py [84/84]........................success
+At least one test was SKIPPED, checking $(@D)/tests.log
+SKIP:  cache-test 2: basic memcache svn_cache test
+SKIP:  cache-test 3: memcache svn_cache with very long keys
+SKIP:  pristine-store-test 3: reject_mismatching_text
+SKIP:  authz_tests.py 1: authz issue #2486 - open root
+SKIP:  authz_tests.py 2: authz issue #2486 - open directory
+SKIP:  authz_tests.py 3: broken authz files cause errors
+SKIP:  authz_tests.py 4: test authz for read operations
+SKIP:  authz_tests.py 5: test authz for write operations
+SKIP:  authz_tests.py 6: test authz for checkout
+SKIP:  authz_tests.py 7: test authz for log and tracing path changes
+SKIP:  authz_tests.py 8: test authz for checkout and update
+SKIP:  authz_tests.py 9: test authz for export with unreadable subfolder
+SKIP:  authz_tests.py 10: test authz for aliases
+SKIP:  authz_tests.py 11: test the authz validation rules
+SKIP:  authz_tests.py 12: test authz for locking
+SKIP:  authz_tests.py 13: authz issue #2712
+SKIP:  authz_tests.py 14: switched to directory, no read access on parents
+SKIP:  authz_tests.py 15: authz issue #3242 - access required at repo root
+SKIP:  authz_tests.py 16: more authz issue #3242 - update to renamed file
+SKIP:  authz_tests.py 17: multiple lines matching a user
+SKIP:  authz_tests.py 18: wc-to-wc-copy with absent nodes and then revert
+SKIP:  authz_tests.py 19: recursive ls with private subtrees
+SKIP:  authz_tests.py 20: authz issue #3781, check case sensitiveness
+SKIP:  authz_tests.py 21: authz should notice a tree conflict
+SKIP:  authz_tests.py 22: wc delete with absent nodes
+SKIP:  authz_tests.py 23: verify commit error reporting
+SKIP:  authz_tests.py 24: upgrade absent nodes to server-excluded
+SKIP:  authz_tests.py 25: delete file without rights on the root
+SKIP:  basic_tests.py 51: verify that neon/serf are compiled if tested
+SKIP:  checkout_tests.py 14: checkout from the root of a Windows drive
+SKIP:  merge_authz_tests.py 1: skipped paths get overriding mergeinfo
+SKIP:  merge_authz_tests.py 3: reintegrate fails if no root access
+SKIP:  redirect_tests.py 1: temporary redirect should error out
+SKIP:  redirect_tests.py 2: redirected checkout
+SKIP:  redirect_tests.py 3: redirected update
+SKIP:  svnsync_tests.py 14: verify that unreadable content is not synced
+SKIP:  svnsync_tests.py 15: verify that copies from unreadable dirs work
+SKIP:  svnsync_tests.py 16: verify copies with mods from unreadable dirs
+SKIP:  svnsync_tests.py 17: verify copies with mods from unreadable dirs +copy
+SKIP:  svnsync_tests.py 32: verify if specifically denied paths dont sync
+SKIP:  svnsync_tests.py 36: copy, then rm at-src-unreadable child
+SKIP:  update_tests.py 24: update a nested wc in a read-only wc
+SKIP:  update_tests.py 32: update wc on the root of a Windows (virtual) drive
+SKIP:  update_tests.py 59: access denied paths should be skipped
+SKIP:  utf8_tests.py 1: conversion of paths and logs to/from utf8
+At least one test XFAILED, checking $(@D)/tests.log
+XFAIL: dirent_uri-test 49: test match with RFC 6125 s. 6.4.3 Rule 3
+XFAIL: fs-test 18: merging commit
+       [[needs to be written to match new merge() algorithm expectations]]
+XFAIL: blame_tests.py 15: blame -g handles changes from empty mergeinfo
+XFAIL: copy_tests.py 103: copy and move conflicts
+XFAIL: diff_tests.py 49: diff URL against working copy with local mods
+XFAIL: export_tests.py 11: export working copy at base revision
+XFAIL: merge_tests.py 49: avoid repeated merges for cyclic merging
+XFAIL: merge_tests.py 64: merge target with non inheritable mergeinfo
+XFAIL: merge_tests.py 114: don't inherit bogus mergeinfo
+XFAIL: merge_tests.py 115: don't inherit bogus working mergeinfo
+XFAIL: merge_tree_conflict_tests.py 12: tree conflicts 5.1: leaf edit, tree del
+XFAIL: merge_tree_conflict_tests.py 13: tree conflicts 5.2: leaf del, tree del
+XFAIL: merge_tree_conflict_tests.py 18: tree conflicts 5.2: leaf del (no ci), tree del
+XFAIL: merge_tree_conflict_tests.py 23: replace vs. delete tree-conflicts
+XFAIL: resolve_tests.py 2: resolving prop conflicts
+XFAIL: revert_tests.py 4: revert a moved file
+XFAIL: revert_tests.py 25: revert a copy with depth=files
+XFAIL: revert_tests.py 26: revert a nested add with depth=immediates
+XFAIL: special_tests.py 18: merge symlink-add from foreign repos
+XFAIL: switch_tests.py 9: switch a file to a dir and back to the file
+XFAIL: tree_conflict_tests.py 14: merge dir: del/rpl/mv onto not-same
+Summary of test results:
+  1583 tests PASSED
+  45 tests SKIPPED
+  21 tests XFAILED (1 WORK-IN-PROGRESS)
+SUMMARY: All tests successful.
+
+make: Leaving directory `$(@D)'