You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2012/08/16 12:18:03 UTC

svn commit: r1373783 [2/50] - in /subversion/branches/compressed-pristines: ./ build/ build/ac-macros/ build/generator/ build/generator/templates/ build/win32/ contrib/client-side/emacs/ contrib/client-side/svn-push/ contrib/client-side/svnmerge/ contr...

Modified: subversion/branches/compressed-pristines/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/gen_base.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/gen_base.py (original)
+++ subversion/branches/compressed-pristines/build/generator/gen_base.py Thu Aug 16 10:17:48 2012
@@ -117,6 +117,7 @@ class GeneratorBase:
     # Lists of pathnames of various kinds
     self.test_deps = []      # Non-BDB dependent items to build for the tests
     self.test_progs = []     # Subset of the above to actually execute
+    self.test_helpers = []   # $ {test_deps} \setminus {test_progs} $
     self.bdb_test_deps = []  # BDB-dependent items to build for the tests
     self.bdb_test_progs = [] # Subset of the above to actually execute
     self.target_dirs = []    # Directories in which files are built
@@ -470,6 +471,8 @@ class TargetExe(TargetLinked):
       self.gen_obj.test_deps.append(self.filename)
       if self.testing != 'skip':
         self.gen_obj.test_progs.append(self.filename)
+      else:
+        self.gen_obj.test_helpers.append(self.filename)
     elif self.install == 'bdb-test':
       self.gen_obj.bdb_test_deps.append(self.filename)
       if self.testing != 'skip':

Modified: subversion/branches/compressed-pristines/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/gen_make.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/gen_make.py (original)
+++ subversion/branches/compressed-pristines/build/generator/gen_make.py Thu Aug 16 10:17:48 2012
@@ -141,6 +141,7 @@ class Generator(gen_base.GeneratorBase):
     data.bdb_test_progs = self.bdb_test_progs + self.bdb_scripts
     data.test_deps = self.test_deps + self.scripts
     data.test_progs = self.test_progs + self.scripts
+    data.test_helpers = self.test_helpers
 
     # write list of all manpages
     data.manpages = self.manpages
@@ -421,7 +422,8 @@ class Generator(gen_base.GeneratorBase):
         # in Makefile.in
         ### we should turn AREA into an object, then test it instead of this
         if area[:5] == 'swig-' and area[-4:] != '-lib' or \
-           area[:7] == 'javahl-':
+           area[:7] == 'javahl-' \
+           or area == 'tools':
           ezt_area.extra_install = 'yes'
 
     ########################################

Modified: subversion/branches/compressed-pristines/build/generator/gen_msvc_dsp.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/gen_msvc_dsp.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/gen_msvc_dsp.py (original)
+++ subversion/branches/compressed-pristines/build/generator/gen_msvc_dsp.py Thu Aug 16 10:17:48 2012
@@ -129,7 +129,6 @@ class Generator(gen_win.WinGeneratorBase
                           ('project_guid', self.makeguid('svn_locale')),
                         ))
     self.write_zlib_project_file('zlib.dsp')
-    self.write_neon_project_file('neon.dsp')
     self.write_serf_project_file('serf.dsp')
     install_targets = self.get_install_targets()
 

Modified: subversion/branches/compressed-pristines/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/gen_vcnet_vcproj.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/compressed-pristines/build/generator/gen_vcnet_vcproj.py Thu Aug 16 10:17:48 2012
@@ -124,10 +124,6 @@ class Generator(gen_win.WinGeneratorBase
       self.write_with_template(fname, 'templates/vcnet_vcxproj.ezt', data)
       self.write_with_template(fname + '.filters', 'templates/vcnet_vcxproj_filters.ezt', data)
 
-  def find_rootpath(self):
-    "Gets the root path as understand by the project system"
-    return "$(SolutionDir)"
-
   def write(self):
     "Write a Solution (.sln)"
 
@@ -142,14 +138,14 @@ class Generator(gen_win.WinGeneratorBase
                                    key=lambda t: t[0]):
       sql.append(_eztdata(header=hdrfile.replace('/', '\\'),
                           source=sqlfile[0].replace('/', '\\'),
-                          dependencies=[x.replace('/', '\\') for x in sqlfile[1:]],
-                          svn_python=sys.executable))
+                          dependencies=[x.replace('/', '\\') for x in sqlfile[1:]]))
 
     # apr doesn't supply vcproj files, the user must convert them
     # manually before loading the generated solution
     self.move_proj_file(self.projfilesdir,
                         'svn_config' + self.vcproj_extension,
                           (
+                            ('svn_python', sys.executable),
                             ('sql', sql),
                             ('project_guid', self.makeguid('__CONFIG__')),
                           )
@@ -160,7 +156,6 @@ class Generator(gen_win.WinGeneratorBase
                           ('project_guid', self.makeguid('svn_locale')),
                         ))
     self.write_zlib_project_file('zlib' + self.vcproj_extension)
-    self.write_neon_project_file('neon' + self.vcproj_extension)
     self.write_serf_project_file('serf' + self.vcproj_extension)
 
     install_targets = self.get_install_targets()
@@ -203,7 +198,8 @@ class Generator(gen_win.WinGeneratorBase
         if depends[i].fname.startswith(self.projfilesdir):
           path = depends[i].fname[len(self.projfilesdir) + 1:]
         else:
-          path = '$(SolutionDir)' + depends[i].fname
+          path = os.path.join(os.path.relpath('.', self.projfilesdir),
+                              depends[i].fname)
         deplist.append(gen_win.ProjectItem(guid=guids[depends[i].name],
                                            index=i,
                                            path=path,

Modified: subversion/branches/compressed-pristines/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/gen_win.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/gen_win.py (original)
+++ subversion/branches/compressed-pristines/build/generator/gen_win.py Thu Aug 16 10:17:48 2012
@@ -73,9 +73,6 @@ class GeneratorBase(gen_base.GeneratorBa
     self.serf_path = None
     self.serf_lib = None
     self.bdb_path = 'db4-win32'
-    self.without_neon = False
-    self.neon_path = 'neon'
-    self.neon_ver = 25005
     self.httpd_path = None
     self.libintl_path = None
     self.zlib_path = 'zlib'
@@ -97,6 +94,7 @@ class GeneratorBase(gen_base.GeneratorBa
     # Instrumentation options
     self.disable_shared = None
     self.static_apr = None
+    self.static_openssl = None
     self.instrument_apr_pools = None
     self.instrument_purify_quantify = None
     self.configure_apr_util = None
@@ -119,10 +117,6 @@ class GeneratorBase(gen_base.GeneratorBa
         self.apr_iconv_path = val
       elif opt == '--with-serf':
         self.serf_path = val
-      elif opt == '--with-neon':
-        self.neon_path = val
-      elif opt == '--without-neon':
-        self.without_neon = True
       elif opt == '--with-httpd':
         self.httpd_path = val
         del self.skip_sections['mod_dav_svn']
@@ -162,6 +156,8 @@ class GeneratorBase(gen_base.GeneratorBa
         self.disable_shared = 1
       elif opt == '--with-static-apr':
         self.static_apr = 1
+      elif opt == '--with-static-openssl':
+        self.static_openssl = 1
       elif opt == '--vsnet-version':
         if val == '2002' or re.match('7(\.\d+)?', val):
           self.vs_version = '2002'
@@ -188,8 +184,8 @@ class GeneratorBase(gen_base.GeneratorBa
           self.sln_version = '11.00'
           self.vcproj_version = '10.0'
           self.vcproj_extension = '.vcxproj'
-        elif val == '11':
-          self.vs_version = '11'
+        elif val == '2012' or val == '11':
+          self.vs_version = '2012'
           self.sln_version = '12.00'
           self.vcproj_version = '11.0'
           self.vcproj_extension = '.vcxproj'
@@ -270,10 +266,6 @@ class WinGeneratorBase(GeneratorBase):
       self._find_zlib()
       self._find_ml()
 
-    # Find neon version
-    if self.neon_path:
-      self._find_neon()
-
     # Find serf and its dependencies
     if self.serf_path:
       self._find_serf()
@@ -391,9 +383,6 @@ class WinGeneratorBase(GeneratorBase):
     if not self.serf_lib:
       install_targets = [x for x in install_targets if x.name != 'serf']
       install_targets = [x for x in install_targets if x.name != 'libsvn_ra_serf']
-    if self.without_neon:
-      install_targets = [x for x in install_targets if x.name != 'neon']
-      install_targets = [x for x in install_targets if x.name != 'libsvn_ra_neon']
 
     # Drop the swig targets if we don't have swig
     if not self.swig_path and not self.swig_libdir:
@@ -402,6 +391,16 @@ class WinGeneratorBase(GeneratorBase):
                                              or isinstance(x, gen_base.TargetSWIGLib)
                                              or isinstance(x, gen_base.TargetSWIGProject))]
 
+    # Drop the Java targets if we don't have a JDK
+    if not self.jdk_path:
+      install_targets = [x for x in install_targets
+                                     if not (isinstance(x, gen_base.TargetJava)
+                                             or isinstance(x, gen_base.TargetJavaHeaders)
+                                             or isinstance(x, gen_base.TargetSWIGProject)
+                                             or x.name == '__JAVAHL__'
+                                             or x.name == '__JAVAHL_TESTS__'
+                                             or x.name == 'libsvnjavahl')]
+
     dll_targets = []
     for target in install_targets:
       if isinstance(target, gen_base.TargetLib):
@@ -690,9 +689,7 @@ class WinGeneratorBase(GeneratorBase):
             and target.external_project):
       return None
 
-    if target.external_project[:5] == 'neon/':
-      path = self.neon_path + target.external_project[4:]
-    elif target.external_project[:5] == 'serf/' and self.serf_lib:
+    if target.external_project[:5] == 'serf/' and self.serf_lib:
       path = self.serf_path + target.external_project[4:]
     elif target.external_project.find('/') != -1:
       path = target.external_project
@@ -715,8 +712,8 @@ class WinGeneratorBase(GeneratorBase):
     if self.enable_nls and name == '__ALL__':
       depends.extend(self.sections['locale'].get_targets())
 
-    # Build ZLib as a dependency of Neon or Serf if we have it
-    if self.zlib_path and (name == 'neon' or name == 'serf'):
+    # Build ZLib as a dependency of Serf if we have it
+    if self.zlib_path and name == 'serf':
       depends.extend(self.sections['zlib'].get_targets())
 
     # To set the correct build order of the JavaHL targets, the javahl-javah
@@ -881,26 +878,10 @@ class WinGeneratorBase(GeneratorBase):
     if self.enable_nls:
       fakedefines.append("ENABLE_NLS")
 
-    # check for neon 0.26.x or newer
-    if self.neon_ver >= 26000:
-      fakedefines.append("SVN_NEON_0_26=1")
-
-    # check for neon 0.27.x or newer
-    if self.neon_ver >= 27000:
-      fakedefines.append("SVN_NEON_0_27=1")
-
-    # check for neon 0.28.x or newer
-    if self.neon_ver >= 28000:
-      fakedefines.append("SVN_NEON_0_28=1")
-
     if self.serf_lib:
       fakedefines.append("SVN_HAVE_SERF")
       fakedefines.append("SVN_LIBSVN_CLIENT_LINKS_RA_SERF")
 
-    if self.neon_lib:
-      fakedefines.append("SVN_HAVE_NEON")
-      fakedefines.append("SVN_LIBSVN_CLIENT_LINKS_RA_NEON")
-
     # check we have sasl
     if self.sasl_path:
       fakedefines.append("SVN_HAVE_SASL")
@@ -938,7 +919,6 @@ class WinGeneratorBase(GeneratorBase):
                             self.path(util_includes) ])
     else:
       fakeincludes.extend([ self.apath(self.apr_util_path, "xml/expat/lib"),
-                            self.apath(self.neon_path, "src"),
                             self.path("subversion/bindings/swig/proxy"),
                             self.apath(self.bdb_path, "include") ])
 
@@ -985,10 +965,13 @@ class WinGeneratorBase(GeneratorBase):
   def get_win_lib_dirs(self, target, cfg):
     "Return the list of library directories for target"
 
-    libcfg = cfg.replace("Debug", "LibD").replace("Release", "LibR")
+    expatlibcfg = cfg.replace("Debug", "LibD").replace("Release", "LibR")
+    if self.static_apr:
+      libcfg = expatlibcfg
+    else:
+      libcfg = cfg
 
     fakelibdirs = [ self.apath(self.bdb_path, "lib"),
-                    self.apath(self.neon_path),
                     self.apath(self.zlib_path),
                     ]
 
@@ -1000,10 +983,10 @@ class WinGeneratorBase(GeneratorBase):
     if self.serf_lib:
       fakelibdirs.append(self.apath(msvc_path_join(self.serf_path, cfg)))
 
-    fakelibdirs.append(self.apath(self.apr_path, cfg))
-    fakelibdirs.append(self.apath(self.apr_util_path, cfg))
+    fakelibdirs.append(self.apath(self.apr_path, libcfg))
+    fakelibdirs.append(self.apath(self.apr_util_path, libcfg))
     fakelibdirs.append(self.apath(self.apr_util_path, 'xml', 'expat',
-                                  'lib', libcfg))
+                                  'lib', expatlibcfg))
 
     if isinstance(target, gen_base.TargetApacheMod):
       fakelibdirs.append(self.apath(self.httpd_path, cfg))
@@ -1029,9 +1012,6 @@ class WinGeneratorBase(GeneratorBase):
     if self.bdb_lib:
       dblib = self.bdb_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
 
-    if self.neon_lib:
-      neonlib = self.neon_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
-
     if self.serf_lib:
       if self.serf_ver_maj != 0:
         serflib = 'serf-%d.lib' % self.serf_ver_maj
@@ -1080,9 +1060,6 @@ class WinGeneratorBase(GeneratorBase):
       if dep.external_lib == '$(SVN_SQLITE_LIBS)' and not self.sqlite_inline:
         nondeplibs.append('sqlite3.lib')
 
-      if self.neon_lib and dep.external_lib == '$(NEON_LIBS)':
-        nondeplibs.append(neonlib)
-
       if self.serf_lib and dep.external_lib == '$(SVN_SERF_LIBS)':
         nondeplibs.append(serflib)
 
@@ -1171,30 +1148,6 @@ class WinGeneratorBase(GeneratorBase):
                          ('use_ml', self.have_ml and 1 or None),
                         ))
 
-  def write_neon_project_file(self, name):
-    if self.without_neon:
-      return
-
-    neon_path = os.path.abspath(self.neon_path)
-    neon_sources = map(lambda x : os.path.relpath(x, self.neon_path),
-                       glob.glob(os.path.join(neon_path, 'src', '*.c')))
-    neon_headers = map(lambda x : os.path.relpath(x, self.neon_path),
-                       glob.glob(os.path.join(neon_path, 'src', '*.h')))
-
-    self.move_proj_file(self.neon_path, name,
-                        (('neon_sources', neon_sources),
-                         ('neon_headers', neon_headers),
-                         ('expat_path',
-                           os.path.relpath(os.path.join(self.apr_util_path,
-                                                        'xml', 'expat', 'lib'),
-                                           self.neon_path)),
-                         ('zlib_path', os.path.relpath(self.zlib_path,
-                                                       self.neon_path)),
-                         ('openssl_path', os.path.relpath(self.openssl_path,
-                                                          self.neon_path)),
-                         ('project_guid', self.makeguid('neon')),
-                        ))
-
   def write_serf_project_file(self, name):
     if not self.serf_lib:
       return
@@ -1214,6 +1167,8 @@ class WinGeneratorBase(GeneratorBase):
     else:
       serflib = 'serf.lib'
 
+    apr_static = self.static_apr and 'APR_STATIC=1' or ''
+    openssl_static = self.static_openssl and 'OPENSSL_STATIC=1' or ''
     self.move_proj_file(self.serf_path, name,
                         (('serf_sources', serf_sources),
                          ('serf_headers', serf_headers),
@@ -1226,13 +1181,14 @@ class WinGeneratorBase(GeneratorBase):
                          ('apr_util_path', os.path.relpath(self.apr_util_path,
                                                            self.serf_path)),
                          ('project_guid', self.makeguid('serf')),
-                         ('apr_static', self.static_apr),
+                         ('apr_static', apr_static),
+                         ('openssl_static', openssl_static),
                          ('serf_lib', serflib),
                         ))
 
   def move_proj_file(self, path, name, params=()):
     ### Move our slightly templatized pre-built project files into place --
-    ### these projects include zlib, neon, serf, locale, config, etc.
+    ### these projects include zlib, serf, locale, config, etc.
 
     dest_file = os.path.join(path, name)
     source_template = os.path.join('templates', name + '.ezt')
@@ -1443,33 +1399,6 @@ class WinGeneratorBase(GeneratorBase):
     finally:
       fp.close()
 
-  def _find_neon(self):
-    "Find the neon version"
-    msg = 'WARNING: Unable to determine neon version\n'
-    if self.without_neon:
-      self.neon_lib = None
-      msg = 'Not attempting to find neon\n'
-    else:
-      try:
-        self.neon_lib = "libneon"
-        fp = open(os.path.join(self.neon_path, '.version'))
-        txt = fp.read()
-        vermatch = re.compile(r'(\d+)\.(\d+)\.(\d+)$', re.M) \
-                     .search(txt)
-
-        if vermatch:
-          version = tuple(map(int, vermatch.groups()))
-          # build/ac-macros/swig.m4 explains the next incantation
-          self.neon_ver = int('%d%02d%03d' % version)
-          msg = 'Found neon version %d.%d.%d\n' % version
-          if self.neon_ver < 25005:
-            msg = 'WARNING: Neon version 0.25.5 or higher is required'
-      except:
-        msg = 'WARNING: Error while determining neon version\n'
-        self.neon_lib = None
-
-    print(msg)
-
   def _get_serf_version(self):
     "Retrieves the serf version from serf.h"
 

Modified: subversion/branches/compressed-pristines/build/generator/templates/build_locale.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/build_locale.ezt?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/templates/build_locale.ezt (original)
+++ subversion/branches/compressed-pristines/build/generator/templates/build_locale.ezt Thu Aug 16 10:17:48 2012
@@ -18,14 +18,14 @@
 
 @echo off
 @rem **************************************************************************
-cd ..\..\subversion\po
+cd ..\..\..\subversion\po
 mkdir ..\..\%1\mo
 set exitcode=0
 [for pofiles]echo Running msgfmt on [pofiles.po]...
 python ..\..\build\strip-po-charset.py [pofiles.po] [pofiles.spo]
-if not errorlevel 0 goto err
+if errorlevel 1 goto err
 msgfmt.exe -c -o ..\..\%1\mo\[pofiles.mo] [pofiles.spo]
-if not errorlevel 0 goto err
+if errorlevel 1 goto err
 del [pofiles.spo]
 [end]
 goto end

Modified: subversion/branches/compressed-pristines/build/generator/templates/build_zlib.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/build_zlib.ezt?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/templates/build_zlib.ezt (original)
+++ subversion/branches/compressed-pristines/build/generator/templates/build_zlib.ezt Thu Aug 16 10:17:48 2012
@@ -55,7 +55,7 @@ set OBJA=contrib\masmx86\gvmat32c.obj co
 set ASM_OPTS=ASFLAGS="%ASFLAGS%" LOC="%LOC%" OBJA="%OBJA%"
 [else]
 if /i "%2" == "Win32" (
-  set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj"
+  set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj" "AS=ml -safeseh"
 ) else if /i "%2" == "x64" (
   set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" AS=ml64 
 )
@@ -108,7 +108,7 @@ set BUILD_OPTS=%ASM_OPTS%
 [end]
 @echo nmake /f win32\Makefile.msc %BUILD_OPTS% STATICLIB=%STATICLIB% %target%
 nmake /nologo /f win32\Makefile.msc %BUILD_OPTS% STATICLIB=%STATICLIB% %target%
-if not errorlevel 0 goto err
+if errorlevel 1 goto err
 goto end
 
 @rem **************************************************************************

Modified: subversion/branches/compressed-pristines/build/generator/templates/makefile.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/makefile.ezt?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/templates/makefile.ezt (original)
+++ subversion/branches/compressed-pristines/build/generator/templates/makefile.ezt Thu Aug 16 10:17:48 2012
@@ -38,6 +38,8 @@ TEST_DEPS =[for test_deps] [test_deps][e
 
 TEST_PROGRAMS =[for test_progs] [test_progs][end]
 
+check-deps test-deps: [for test_helpers] [test_helpers][end]
+
 MANPAGES =[for manpages] [manpages][end]
 
 CLEAN_FILES =[for cfiles] [cfiles][end]
@@ -131,7 +133,7 @@ $([target.varname]_OBJECTS): $([target.v
 	$(MKDIR) [areas.files.installdir]
 	cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][else]
 	cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][end][end][for areas.apache_files]
-	cd [areas.apache_files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR_TOOLS)" ; $(INSTALL_MOD_SHARED_TOOLS) -n [areas.apache_files.name] [areas.apache_files.filename][end]
+	cd [areas.apache_files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] [areas.apache_files.filename][end]
 [if-any areas.extra_install]	$(INSTALL_EXTRA_[areas.uppervar])
 [end][end][end]
 

Modified: subversion/branches/compressed-pristines/build/generator/templates/serf.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/serf.vcproj.ezt?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/templates/serf.vcproj.ezt (original)
+++ subversion/branches/compressed-pristines/build/generator/templates/serf.vcproj.ezt Thu Aug 16 10:17:48 2012
@@ -40,9 +40,9 @@
             ATLMinimizesCRunTimeLibraryUsage="FALSE">
             <Tool
                 Name="VCNMakeTool"
-                BuildCommandLine="nmake /s /nologo /f serf.mak ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
-                ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
-                CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path]  [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+                BuildCommandLine="nmake /s /nologo /f serf.mak ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]"
+                ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]"
+                CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]"
                 Output="$(OutDir)\[serf_lib]"/>
         </Configuration>
         <Configuration
@@ -56,9 +56,9 @@
             ATLMinimizesCRunTimeLibraryUsage="FALSE">
             <Tool
                 Name="VCNMakeTool"
-                BuildCommandLine="nmake /s /nologo /f serf.mak ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
-                ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path]  [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
-                CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+                BuildCommandLine="nmake /s /nologo /f serf.mak ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]"
+                ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]"
+                CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]"
                 Output="$(OutDir)\[serf_lib]"/>
         </Configuration>
 [end]    </Configurations>

Modified: subversion/branches/compressed-pristines/build/generator/templates/serf.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/serf.vcxproj.ezt?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/templates/serf.vcxproj.ezt (original)
+++ subversion/branches/compressed-pristines/build/generator/templates/serf.vcxproj.ezt Thu Aug 16 10:17:48 2012
@@ -46,9 +46,9 @@
   <PropertyGroup>
 [for configs][for platforms]    <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[configs]</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[configs]</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path]  [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]</NMakeCleanCommandLine>
     <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(OutDir)\[serf_lib]</NMakeOutput>
 [end][end]  </PropertyGroup>
   <ItemDefinitionGroup>

Modified: subversion/branches/compressed-pristines/build/generator/templates/svn_config.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/svn_config.vcproj.ezt?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/templates/svn_config.vcproj.ezt (original)
+++ subversion/branches/compressed-pristines/build/generator/templates/svn_config.vcproj.ezt Thu Aug 16 10:17:48 2012
@@ -33,7 +33,7 @@
 			Name="[configs]|[platforms]"
 			OutputDirectory="."
 			BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
-			IntermediateDirectory="..\..\$(ConfigurationName)"
+			IntermediateDirectory="..\..\..\[configs]"
 			ConfigurationType="10"
 			UseOfMFC="0"
 			DeleteExtensionsOnClean="*.obj;*.ilk;*.pdb;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;$(TargetPath)"
@@ -53,7 +53,7 @@
 	</Configurations>
 	<Files>
 		<File
-			RelativePath="..\..\subversion\svn_private_config.h">
+			RelativePath="$(IntDir)\svn_private_config.h">
 [for platforms][for configs]			<FileConfiguration
 				Name="[configs]|[platforms]"
 				ExcludedFromBuild="TRUE">
@@ -62,25 +62,33 @@
 			</FileConfiguration>
 [end][end]		</File>
 		<File
-			RelativePath="..\..\subversion\svn_private_config.hw">
+			RelativePath="..\..\..\subversion\svn_private_config.hw">
 [for platforms][for configs]			<FileConfiguration
 				Name="[configs]|[platforms]">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Creating svn_private_config.h from svn_private_config.hw."
-					CommandLine="copy ..\..\..\subversion\svn_private_config.hw ..\..\..\subversion\svn_private_config.h &gt; nul
-"
-					Outputs="..\..\subversion\svn_private_config.h"/>
+					CommandLine="&quot;[svn_python]&quot; &quot;$(SolutionDir)\build\transform_config_hw.py&quot; [platforms] &quot;$(InputPath)&quot; &quot;$(IntDir)\svn_private_config.h&quot;"
+					Outputs="$(IntDir)\svn_private_config.h"/>
 			</FileConfiguration>
 [end][end]		</File>
 [for sql]		<File
+			RelativePath="$(SolutionDir)\[sql.header]">
+[for platforms][for configs]			<FileConfiguration
+				Name="[configs]|[platforms]"
+				ExcludedFromBuild="TRUE">
+				<Tool
+					Name="VCCustomBuildTool"/>
+			</FileConfiguration>
+[end][end]		</File>
+		<File
 			RelativePath="../../../[sql.source]">
 [for platforms][for configs]			<FileConfiguration
 				Name="[configs]|[platforms]">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating [sql.header]"
-					CommandLine="&quot;[sql.svn_python]&quot; &quot;$(SolutionDir)\build\transform_sql.py&quot; &quot;$(InputPath)&quot; &quot;$(SolutionDir)\[sql.header]&quot;"
+					CommandLine="&quot;[svn_python]&quot; &quot;$(SolutionDir)\build\transform_sql.py&quot; &quot;$(InputPath)&quot; &quot;$(SolutionDir)\[sql.header]&quot;"
 					AdditionalDependencies="[for sql.dependencies]$(SolutionDir)\[sql.dependencies];[end]"
 					Outputs="$(SolutionDir)\[sql.header]"
 				/>
@@ -91,4 +99,3 @@
 	<Globals>
 	</Globals>
 </VisualStudioProject>
-

Modified: subversion/branches/compressed-pristines/build/generator/templates/svn_config.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/svn_config.vcxproj.ezt?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/templates/svn_config.vcxproj.ezt (original)
+++ subversion/branches/compressed-pristines/build/generator/templates/svn_config.vcxproj.ezt Thu Aug 16 10:17:48 2012
@@ -26,6 +26,7 @@
     </ProjectConfiguration>
 [end][end]  </ItemGroup>
   <PropertyGroup Label="Globals">
+    <ProjectName>svn_config</ProjectName>
     <ProjectGuid>[project_guid]</ProjectGuid>
     <Keyword>MakeFileProj</Keyword>
   </PropertyGroup>
@@ -34,6 +35,7 @@
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
     <PlatformToolset>[toolset_version]</PlatformToolset>
+    <CLRSupport>false</CLRSupport>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -44,10 +46,10 @@
 [end][end]  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
 [for configs][for platforms]    <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(SolutionDir)\$(Configuration)\</IntDir>
 [end][end]  </PropertyGroup>
   <ItemGroup>
-    <CustomBuild Include="$(SolutionDir)\subversion\svn_private_config.h">
+    <CustomBuild Include="$(IntDir)svn_private_config.h">
 [for configs][for platforms]      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">true</ExcludedFromBuild>
 [end][end]    </CustomBuild>
   </ItemGroup>
@@ -55,18 +57,24 @@
     <CustomBuild Include="$(SolutionDir)\subversion\svn_private_config.hw">
       <FileType>Document</FileType>
 [for configs][for platforms]      <Message Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">Creating svn_private_config.h from svn_private_config.hw.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">copy $(SolutionDir)\subversion\svn_private_config.hw $(SolutionDir)\subversion\svn_private_config.h &gt; nul:</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(SolutionDir)\subversion\svn_private_config.h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[svn_python]" "$(SolutionDir)\build\transform_config_hw.py" $(Platform) "%(FullPath)" "$(IntDir)svn_private_config.h"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(IntDir)svn_private_config.h;%(Outputs)</Outputs>
 [end][end]    </CustomBuild>
-[for sql]    <CustomBuild Include="$(SolutionDir)\[sql.source]">
+[for sql]    <CustomBuild Include="$(SolutionDir)\[sql.header]">
+[for configs][for platforms]      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">true</ExcludedFromBuild>
+[end][end]    </CustomBuild>
+    <CustomBuild Include="$(SolutionDir)\[sql.source]">
       <FileType>Document</FileType>
 [for configs][for platforms]      <Message Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">Generating [sql.header].</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[sql.svn_python]" "$(SolutionDir)\build\transform_sql.py" "%(FullPath)" "$(SolutionDir)\[sql.header]"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[svn_python]" "$(SolutionDir)\build\transform_sql.py" "%(FullPath)" "$(SolutionDir)\[sql.header]"</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(SolutionDir)\[sql.header];%(Outputs)</Outputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[for sql.dependencies]$(SolutionDir)\[sql.dependencies];[end]%(AdditionalInputs)</AdditionalInputs>
 [end][end]
     </CustomBuild>
 [end]  </ItemGroup>
+  <ItemGroup>
+[for sql][for sql.dependencies]    <None Include="$(SolutionDir)\[sql.dependencies]" />
+[end][end]  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Modified: subversion/branches/compressed-pristines/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/vcnet_vcproj.ezt?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/branches/compressed-pristines/build/generator/templates/vcnet_vcproj.ezt Thu Aug 16 10:17:48 2012
@@ -45,7 +45,7 @@
 				EnableIntrinsicFunctions="TRUE"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="TRUE"
-[end]				AdditionalIncludeDirectories="[for includes][includes][if-index includes last][else];[end][end]"
+[end]				AdditionalIncludeDirectories="..\..\..\[configs.name];[for includes][includes][if-index includes last][else];[end][end]"
 				PreprocessorDefinitions="[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][is platforms "x64"]WIN64;[end][for configs.defines][configs.defines][if-index configs.defines last][else];[end][end];_CRT_SECURE_NO_WARNINGS"
 [is configs.name "Debug"]				MinimalRebuild="TRUE"
 				RuntimeLibrary="3"

Modified: subversion/branches/compressed-pristines/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/vcnet_vcxproj.ezt?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/compressed-pristines/build/generator/templates/vcnet_vcxproj.ezt Thu Aug 16 10:17:48 2012
@@ -33,7 +33,8 @@
 [for platforms][for configs]  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'" Label="Configuration">
     <ConfigurationType>[config_type]</ConfigurationType>
     <UseDebugLibraries>[is configs.name "Debug"]true[else]false[end]</UseDebugLibraries>
-    <PlatformToolset>[toolset_version]</PlatformToolset>
+[is configs.name "Release"]    <WholeProgramOptimization>true</WholeProgramOptimization>
+[end]    <PlatformToolset>[toolset_version]</PlatformToolset>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -56,7 +57,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <StringPooling>true</StringPooling>
-[end]      <AdditionalIncludeDirectories>[for includes][includes];[end]%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+[end]      <AdditionalIncludeDirectories>$(SolutionDir)[configs.name];[for includes][includes];[end];%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][is platforms "x64"]WIN64;[end][for configs.defines][configs.defines];[end]%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: subversion/branches/compressed-pristines/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/run_tests.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/run_tests.py (original)
+++ subversion/branches/compressed-pristines/build/run_tests.py Thu Aug 16 10:17:48 2012
@@ -29,7 +29,7 @@
             [--fs-type=<fs-type>] [--fsfs-packing] [--fsfs-sharding=<n>]
             [--list] [--milestone-filter=<regex>] [--mode-filter=<type>]
             [--server-minor-version=<version>]
-            [--config-file=<file>]
+            [--config-file=<file>] [--ssl-cert=<file>]
             <abs_srcdir> <abs_builddir>
             <prog ...>
 
@@ -84,7 +84,15 @@ def _get_term_width():
       return None
     return cr
 
-  cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
+  cr = None
+  if not cr:
+    try:
+      cr = (os.environ['SVN_MAKE_CHECK_LINES'],
+            os.environ['SVN_MAKE_CHECK_COLUMNS'])
+    except:
+      cr = None
+  if not cr:
+    cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
   if not cr:
     try:
       fd = os.open(os.ctermid(), os.O_RDONLY)
@@ -94,12 +102,15 @@ def _get_term_width():
       pass
   if not cr:
     try:
-      cr = (env['LINES'], env['COLUMNS'])
+      cr = (os.environ['LINES'], os.environ['COLUMNS'])
     except:
       cr = None
   if not cr:
     # Default
-    cr = (25, 80)
+    if sys.platform == 'win32':
+      cr = (25, 79)
+    else:
+      cr = (25, 80)
   return int(cr[1])
 
 
@@ -113,7 +124,7 @@ class TestHarness:
                cleanup=None, enable_sasl=None, parallel=None, config_file=None,
                fsfs_sharding=None, fsfs_packing=None,
                list_tests=None, svn_bin=None, mode_filter=None,
-               milestone_filter=None):
+               milestone_filter=None, set_log_level=None, ssl_cert=None):
     '''Construct a TestHarness instance.
 
     ABS_SRCDIR and ABS_BUILDDIR are the source and build directories.
@@ -160,9 +171,11 @@ class TestHarness:
       self.config_file = os.path.abspath(config_file)
     self.list_tests = list_tests
     self.milestone_filter = milestone_filter
+    self.set_log_level = set_log_level
     self.svn_bin = svn_bin
     self.mode_filter = mode_filter
     self.log = None
+    self.ssl_cert = ssl_cert
     if not sys.stdout.isatty() or sys.platform == 'win32':
       TextColors.disable()
 
@@ -440,6 +453,13 @@ class TestHarness:
       svntest.main.options.list_tests = True
     if self.milestone_filter is not None:
       svntest.main.options.milestone_filter = self.milestone_filter
+    if self.set_log_level is not None:
+      # Somehow the logger is not setup correctly from win-tests.py, so
+      # setting the log level would fail. ### Please fix
+      if svntest.main.logger is None:
+        import logging
+        svntest.main.logger = logging.getLogger()
+      svntest.main.logger.setLevel(self.set_log_level)
     if self.svn_bin is not None:
       svntest.main.options.svn_bin = self.svn_bin
     if self.fsfs_sharding is not None:
@@ -448,6 +468,8 @@ class TestHarness:
       svntest.main.options.fsfs_packing = self.fsfs_packing
     if self.mode_filter is not None:
       svntest.main.options.mode_filter = self.mode_filter
+    if self.ssl_cert is not None:
+      svntest.main.options.ssl_cert = self.ssl_cert
 
     svntest.main.options.srcdir = self.srcdir
 
@@ -604,7 +626,7 @@ def main():
                             'fsfs-packing', 'fsfs-sharding=',
                             'enable-sasl', 'parallel', 'config-file=',
                             'log-to-stdout', 'list', 'milestone-filter=',
-                            'mode-filter='])
+                            'mode-filter=', 'set-log-level=', 'ssl-cert='])
   except getopt.GetoptError:
     args = []
 
@@ -614,9 +636,10 @@ def main():
 
   base_url, fs_type, verbose, cleanup, enable_sasl, http_library, \
     server_minor_version, fsfs_sharding, fsfs_packing, parallel, \
-    config_file, log_to_stdout, list_tests, mode_filter, milestone_filter= \
+    config_file, log_to_stdout, list_tests, mode_filter, milestone_filter, \
+    set_log_level, ssl_cert = \
             None, None, None, None, None, None, None, None, None, None, None, \
-            None, None, None, None
+            None, None, None, None, None, None
   for opt, val in opts:
     if opt in ['-u', '--url']:
       base_url = val
@@ -648,6 +671,10 @@ def main():
       milestone_filter = val
     elif opt in ['--mode-filter']:
       mode_filter = val
+    elif opt in ['--set-log-level']:
+      set_log_level = val
+    elif opt in ['--ssl-cert']:
+      ssl_cert = val
     else:
       raise getopt.GetoptError
 
@@ -662,7 +689,8 @@ def main():
                    base_url, fs_type, http_library, server_minor_version,
                    verbose, cleanup, enable_sasl, parallel, config_file,
                    fsfs_sharding, fsfs_packing, list_tests,
-                   mode_filter=mode_filter, milestone_filter=milestone_filter)
+                   mode_filter=mode_filter, milestone_filter=milestone_filter,
+                   set_log_level=set_log_level, ssl_cert=ssl_cert)
 
   failed = th.run(args[2:])
   if failed:

Modified: subversion/branches/compressed-pristines/build/transform_sql.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/transform_sql.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/transform_sql.py (original)
+++ subversion/branches/compressed-pristines/build/transform_sql.py Thu Aug 16 10:17:48 2012
@@ -49,7 +49,7 @@ class Processor(object):
 
   # a few SQL comments that act as directives for this transform system
   re_format = re.compile('-- *format: *([0-9]+)')
-  re_statement = re.compile('-- *STMT_([A-Z_0-9]+)')
+  re_statement = re.compile('-- *STMT_([A-Z_0-9]+)( +\(([^\)]*)\))?')
   re_include = re.compile('-- *include: *([-a-z]+)')
   re_define = re.compile('-- *define: *([A-Z_0-9]+)')
 
@@ -66,6 +66,13 @@ class Processor(object):
     self.close_define()
     self.output.write('#define STMT_%s %d\n' % (match.group(1),
                                                 self.stmt_count))
+
+    if match.group(3) == None:
+      info = 'NULL'
+    else:
+      info = '"' + match.group(3) + '"'
+    self.output.write('#define STMT_%d_INFO {"STMT_%s", %s}\n' %
+                      (self.stmt_count, match.group(1), info))
     self.output.write('#define STMT_%d \\\n' % (self.stmt_count,))
     self.var_printed = True
 
@@ -103,10 +110,35 @@ class Processor(object):
     for line in input.split('\n'):
       line = line.replace('"', '\\"')
 
+      # IS_STRICT_DESCENDANT_OF()
+
+      # A common operation in the working copy is determining descendants of
+      # a node. To allow Sqlite to use its indexes to provide the answer we
+      # must provide simple less than and greater than operations.
+      #
+      # For relative paths that consist of one or more components like 'subdir'
+      # we can accomplish this by comparing local_relpath with 'subdir/' and
+      # 'subdir0' ('/'+1 = '0')
+      #
+      # For the working copy root this case is less simple and not strictly
+      # valid utf-8/16 (but luckily Sqlite doesn't validate utf-8 nor utf-16).
+      # The binary blob x'FFFF' is higher than any valid utf-8 and utf-16
+      # sequence.
+      #
+      # So for the root we can compare with > '' and < x'FFFF'. (This skips the
+      # root itself and selects all descendants)
+      #
+      ### RH: I implemented this first with a user defined Sqlite function. But
+      ### when I wrote the documentation for it, I found out I could just
+      ### define it this way, without losing the option of just dropping the
+      ### query in a plain sqlite3.
+
       # '/'+1 == '0'
-      line = re.sub(r'IS_STRICT_DESCENDANT_OF[(]([A-Za-z_.]+), ([?][0-9]+)[)]',
-                    r"((\1) > (\2) || '/' AND (\1) < (\2) || '0') ",
-                    line)
+      line = re.sub(
+            r'IS_STRICT_DESCENDANT_OF[(]([A-Za-z_.]+), ([?][0-9]+)[)]',
+            r"(((\1) > (CASE (\2) WHEN '' THEN '' ELSE (\2) || '/' END))" +
+            r" AND ((\1) < CASE (\2) WHEN '' THEN X'FFFF' ELSE (\2) || '0' END))",
+            line)
 
       if line.strip():
         handled = False
@@ -167,6 +199,13 @@ def main(input_filepath, output):
       + ', \\\n'.join('    STMT_%d' % (i,) for i in range(proc.stmt_count))
       + ', \\\n    NULL \\\n  }\n')
 
+    output.write('\n')
+
+    output.write(
+      '#define %s_DECLARE_STATEMENT_INFO(varname) \\\n' % (var_name,)
+      + '  static const char * const varname[][2] = { \\\n'
+      + ', \\\n'.join('    STMT_%d_INFO' % (i) for i in range(proc.stmt_count))
+      + ', \\\n    {NULL, NULL} \\\n  }\n')
 
 if __name__ == '__main__':
   if len(sys.argv) < 2 or len(sys.argv) > 3:

Modified: subversion/branches/compressed-pristines/build/win32/make_dist.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/win32/make_dist.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/win32/make_dist.py (original)
+++ subversion/branches/compressed-pristines/build/win32/make_dist.py Thu Aug 16 10:17:48 2012
@@ -211,10 +211,10 @@ _disttree = {'': OptFile('%(readme)s', '
                      File('%(blddir)s/svnversion/svnversion.pdb'),
                      File('%(blddir)s/svnrdump/svnrdump.exe'),
                      File('%(blddir)s/svnrdump/svnrdump.pdb'),
+                     File('%(blddir)s/svnmucc/svnmucc.exe'),
+                     File('%(blddir)s/svnmucc/svnmucc.pdb'),
                      File('%(blddir)s/../contrib/client-side/svn-push/svn-push.exe'),
                      File('%(blddir)s/../contrib/client-side/svn-push/svn-push.pdb'),
-                     File('%(blddir)s/../tools/client-side/svnmucc/svnmucc.exe'),
-                     File('%(blddir)s/../tools/client-side/svnmucc/svnmucc.pdb'),
                      File('%(blddir)s/../tools/server-side/svnauthz-validate.exe'),
                      File('%(blddir)s/../tools/server-side/svnauthz-validate.pdb'),
                      File('%(blddir)s/../tools/server-side/svn-populate-node-origins-index.exe'),
@@ -273,9 +273,6 @@ _disttree = {'': OptFile('%(readme)s', '
                               File('%(@apr-util)s/%(aprxml)s/xml.lib'),
                               File('%(@apr-util)s/%(aprxml)s/xml.pdb'),
                               ),
-             'lib/neon': (File('%(@neon)s/libneon.lib'),
-                          OptFile('%(@zlib)s/zlibstat.lib'),
-                          ),
 
              'lib/serf': (File('%(@serf)s/Release/serf.lib'),
                           ),
@@ -286,7 +283,6 @@ _disttree = {'': OptFile('%(readme)s', '
 
              'licenses': None,
              'licenses/bdb': File('%(@berkeley-db)s/LICENSE'),
-             'licenses/neon': File('%(@neon)s/src/COPYING.LIB'),
              'licenses/serf': File('%(@serf)s/LICENSE'),
              'licenses/zlib': File('%(@zlib)s/README'),
              'licenses/apr-util': (File('%(@apr-util)s/LICENSE'),
@@ -381,8 +377,6 @@ def _read_config():
                    os.path.abspath(os.path.join(_srcdir, 'apr-iconv')),
                    '@apr-util':
                    os.path.abspath(os.path.join(_srcdir, 'apr-util')),
-                   '@neon':
-                   os.path.abspath(os.path.join(_srcdir, 'neon')),
                    }
 
   cfg = configparser.ConfigParser(path_defaults)

Modified: subversion/branches/compressed-pristines/build/win32/vc6-build.bat.in
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/win32/vc6-build.bat.in?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/win32/vc6-build.bat.in (original)
+++ subversion/branches/compressed-pristines/build/win32/vc6-build.bat.in Thu Aug 16 10:17:48 2012
@@ -56,7 +56,6 @@ if not exist src-%DIR% goto svnerr
 if not exist zlib goto zliberr
 if not exist zlib\zlibstat.lib goto zlibstaterr
 if not exist src-%DIR%\db4-win32 goto bdberr
-if not exist src-%DIR%\neon goto neonerr
 if not exist gettext goto gettexterr
 goto allok
 
@@ -84,9 +83,6 @@ goto end
 :bdberr
 echo Unable to find Berekely DB
 goto end
-:neonerr
-echo Unable to find neon
-goto end
 :gettexterr
 echo Unable to find gettext
 goto end
@@ -137,6 +133,7 @@ copy src-%DIR%\Release\subversion\svnloo
 copy src-%DIR%\Release\subversion\svnserve\svnserve.exe svn-win32-%VER%\bin
 copy src-%DIR%\Release\subversion\svnversion\svnversion.exe svn-win32-%VER%\bin
 copy src-%DIR%\Release\subversion\svnrdump\svnrdump.exe svn-win32-%VER%\bin
+copy src-%DIR%\Release\subversion\svnmucc\svnmucc.exe svn-win32-%VER%\bin
 copy src-%DIR%\Release\subversion\mod_authz_svn\mod_authz_svn.so svn-win32-%VER%\httpd
 copy src-%DIR%\Release\subversion\mod_dav_svn\mod_dav_svn.so svn-win32-%VER%\httpd
 copy svn-win32-%VER%\bin\intl.dll "%APACHEDIR%\bin"

Modified: subversion/branches/compressed-pristines/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/configure.ac?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/configure.ac (original)
+++ subversion/branches/compressed-pristines/configure.ac Thu Aug 16 10:17:48 2012
@@ -115,29 +115,7 @@ AC_SUBST(SVN_LT_SOVERSION)
 dnl Search for pkg-config
 AC_PATH_PROG(PKG_CONFIG, pkg-config)
 
-# 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 0\.29"
-NEON_RECOMMENDED_VER="0.29.6"
-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,
-  AS_HELP_STRING([--disable-neon-version-check],
-                 [do not check the Neon version]),
-  [
-    if test "$enableval" = "no" ; then
-      NEON_ALLOWED_LIST="any"
-    fi
-  ],
-  [])
-SVN_LIB_NEON($NEON_ALLOWED_LIST, $NEON_RECOMMENDED_VER, $NEON_URL)
-
-if test "$svn_lib_neon" = "yes"; then
-  AC_DEFINE([SVN_HAVE_NEON], 1,
-            [Defined if support for Neon is enabled])
-fi
-
-dnl Search for serf as an alternative to neon
+dnl Search for serf
 SVN_LIB_SERF(1,0,0)
 
 if test "$svn_lib_serf" = "yes"; then
@@ -166,9 +144,11 @@ dnl Find Apache with a recent-enough mag
 SVN_FIND_APACHE(20020903)
 
 dnl Search for SQLite
-SQLITE_MINIMUM_VER="3.6.18"
-SQLITE_RECOMMENDED_VER="3.7.6.3"
-SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER}.tar.gz"
+SQLITE_MINIMUM_VER="3.7.12"
+SQLITE_RECOMMENDED_VER="3.7.12"
+SQLITE_RECOMMENDED_VER_URL="3071200"
+SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER_URL}.zip"
+
 SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
                ${SQLITE_URL})
 
@@ -184,6 +164,12 @@ if test -n "$sqlite_compat_ver" && test 
   CFLAGS="-DSVN_SQLITE_MIN_VERSION_NUMBER=$sqlite_compat_ver_num $CFLAGS"
 fi
 
+SVN_CHECK_FOR_ATOMIC_BUILTINS
+
+if test "$svn_cv_atomic_builtins" = "yes"; then
+    AC_DEFINE(SVN_HAS_ATOMIC_BUILTINS, 1, [Define if compiler provides atomic builtins])
+fi
+
 dnl Set up a number of directories ---------------------
 
 dnl Create SVN_BINDIR for proper substitution
@@ -389,6 +375,11 @@ AC_ARG_WITH(expat,
                  [svn_lib_expat="$withval"],
                  [svn_lib_expat="::expat"])
 
+# APR-util accepts "builtin" as an argument to this option so if the user
+# passed "builtin" pretend the user didn't specify the --with-expat option
+# at all. Expat will (hopefully) be found in apr-util.
+test "_$svn_lib_expat" = "_builtin" && svn_lib_expat="::expat"
+
 AC_MSG_CHECKING([for Expat])
 if test -n "`echo "$svn_lib_expat" | $EGREP ":.*:"`"; then
   SVN_XML_INCLUDES=""
@@ -488,43 +479,10 @@ if test "$svn_lib_sasl" = "yes"; then
             [Defined if Cyrus SASL v2 is present on the system])
 fi
 
-dnl Mac OS KeyChain -------------------
-
-AC_ARG_ENABLE(keychain,
-  AS_HELP_STRING([--disable-keychain], 
-  [Disable use of Mac OS KeyChain for auth credentials]),
-  [enable_keychain=$enableval],[enable_keychain=yes])
-
-AC_MSG_CHECKING([for Mac OS KeyChain Services])
-
-if test "$enable_keychain" = "yes"; then
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <AvailabilityMacros.h>
-#if !DARWIN || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_2)
-#error KeyChain API unavailable.
-#endif]], [[]])],[],[enable_keychain=no])
-fi
-
-if test "$enable_keychain" = "yes"; then
-  dnl ### Hack.  We should only need to pass the -framework options when
-  dnl linking libsvn_subr, since it is the only library that uses Keychain.
-  dnl
-  dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for
-  dnl OS X frameworks like it does for normal libraries, so we need to
-  dnl explicitly pass the option to all the users of libsvn_subr to allow
-  dnl static builds to link successfully.
-  dnl
-  dnl This does mean that all executables we link will be linked directly
-  dnl to these frameworks - even when building shared libraries - but that
-  dnl shouldn't cause any problems.
-  LIBS="$LIBS -framework Security"
-  LIBS="$LIBS -framework CoreFoundation"
-  LIBS="$LIBS -framework CoreServices"
-  AC_DEFINE([SVN_HAVE_KEYCHAIN_SERVICES], [1], [Is Mac OS KeyChain support enabled?])
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
+dnl Mac OS soecufuc features -------------------
 
+SVN_LIB_MACOS_PLIST
+SVN_LIB_MACOS_KEYCHAIN
 
 dnl APR_HAS_DSO -------------------
 
@@ -710,13 +668,23 @@ if test "$enable_nls" = "yes"; then
   fi
 fi
 
-AH_BOTTOM(
+AH_BOTTOM([
+/* Indicate to translators that string X should be translated.  Do not look
+   up the translation at run time; just expand to X.  This macro is suitable
+   for use where a constant string is required at compile time. */
 #define N_(x) x
+/* Indicate to translators that we have decided the string X should not be
+   translated.  Expand to X. */
 #define U_(x) x
 #ifdef ENABLE_NLS
 #include <locale.h>
 #include <libintl.h>
+/* Indicate to translators that string X should be translated.  At run time,
+   look up and return the translation of X. */
 #define _(x) dgettext(PACKAGE_NAME, x)
+/* Indicate to translators that strings X1 and X2 are singular and plural
+   forms of the same message, and should be translated.  At run time, return
+   an appropriate translation depending on the number N. */
 #define Q_(x1, x2, n) dngettext(PACKAGE_NAME, x1, x2, n)
 #else
 #define _(x) (x)
@@ -724,7 +692,7 @@ AH_BOTTOM(
 #define gettext(x) (x)
 #define dgettext(domain, x) (x)
 #endif
-)
+])
 
 dnl Used to simulate makefile conditionals.
 GETTEXT_CODESET=\#
@@ -825,7 +793,7 @@ dnl Build and install rules ------------
 INSTALL_STATIC_RULES="install-bin install-docs"
 INSTALL_RULES="install-fsmod-lib install-ramod-lib install-lib install-include install-static"
 INSTALL_RULES="$INSTALL_RULES $INSTALL_APACHE_RULE"
-BUILD_RULES="fsmod-lib ramod-lib lib bin test $BUILD_APACHE_RULE tools"
+BUILD_RULES="fsmod-lib ramod-lib lib bin test sub-test $BUILD_APACHE_RULE tools"
 
 if test "$svn_lib_berkeley_db" = "yes"; then
   BUILD_RULES="$BUILD_RULES bdb-lib bdb-test"
@@ -834,12 +802,6 @@ if test "$svn_lib_berkeley_db" = "yes"; 
   BDB_TEST_DEPS="\$(BDB_TEST_DEPS)"
   BDB_TEST_PROGRAMS="\$(BDB_TEST_PROGRAMS)"
 fi
-  
-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_STATIC_RULES="$INSTALL_STATIC_RULES install-neon-lib"
-fi
 
 if test "$svn_lib_serf" = "yes"; then
   BUILD_RULES="$BUILD_RULES serf-lib"
@@ -894,6 +856,8 @@ AC_FUNC_VPRINTF
 dnl check for functions needed in special file handling
 AC_CHECK_FUNCS(symlink readlink)
 
+dnl check for uname
+AC_CHECK_HEADERS(sys/utsname.h, [AC_CHECK_FUNCS(uname)], [])
 
 dnl Process some configuration options ----------
 
@@ -918,10 +882,7 @@ AS_HELP_STRING([--with-openssl],
                 process where to locate the OpenSSL library when (and only when)
                 building Serf as an integrated part of the Subversion build
                 process. When linking to a previously installed version of Serf
-                instead, you do not need to use this option. (Note that
-                Subversion may also or alternatively be configured to use the
-                Neon library for http:// and https:// access; see the
-                --with-neon and --with-ssl options.)]),
+                instead, you do not need to use this option.]),
 [])
 
 AC_ARG_ENABLE(debug,
@@ -990,7 +951,6 @@ AC_SUBST([libsvn_fs_fs_LDFLAGS])
 AC_SUBST([libsvn_fs_util_LDFLAGS])
 AC_SUBST([libsvn_ra_LDFLAGS])
 AC_SUBST([libsvn_ra_local_LDFLAGS])
-AC_SUBST([libsvn_ra_neon_LDFLAGS])
 AC_SUBST([libsvn_ra_serf_LDFLAGS])
 AC_SUBST([libsvn_ra_svn_LDFLAGS])
 AC_SUBST([libsvn_repos_LDFLAGS])
@@ -1178,12 +1138,12 @@ if test "$RUBY" != "none"; then
       AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18, none)
     fi
     AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
-    svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MAJOR))'`"
+    svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MAJOR))'`"
     ])
     RUBY_MAJOR="$svn_cv_ruby_major"
 
     AC_CACHE_CHECK([for Ruby minor version], [svn_cv_ruby_minor],[
-    svn_cv_ruby_minor="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MINOR))'`"
+    svn_cv_ruby_minor="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MINOR))'`"
     ])
     RUBY_MINOR="$svn_cv_ruby_minor"
 
@@ -1213,7 +1173,8 @@ SVN_CHECK_CTYPESGEN
 dnl decide whether we want to link against the RA/FS libraries
 AC_ARG_ENABLE(runtime-module-search,
 AS_HELP_STRING([--enable-runtime-module-search],
-               [Turn on dynamic loading of RA/FS libraries]),
+               [Turn on dynamic loading of RA/FS libraries including
+                third-party FS libraries]),
 [
     if test "$enableval" = "yes"; then
       use_dso=yes
@@ -1226,11 +1187,6 @@ AS_HELP_STRING([--enable-runtime-module-
 ])
 
 if test "$svn_enable_shared" = "no" || test "$use_dso" != "yes"; then
-  ### We want ra_local first to handle the following scenario:
-  ### user has neon and db3 in /usr/local, and db4 in
-  ### /usr/local/BerkeleyDB.4.0.  If libsvn_ra_neon.la comes before 
-  ### libsvn_fs.la then libtool ends up linking libsvn_fs to the db3
-  ### in /usr/local/lib
   AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL, 1,
       [Defined if libsvn_client should link against libsvn_ra_local])
   svn_ra_lib_deps="\$(RA_LOCAL_DEPS)"
@@ -1242,14 +1198,6 @@ if test "$svn_enable_shared" = "no" || t
   svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_SVN_DEPS)"
   svn_ra_lib_link="$svn_ra_lib_link \$(RA_SVN_LINK)"
 
-  if test "$svn_lib_neon" = "yes"; then
-    AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_NEON, 1,
-          [Defined if libsvn_client should link against libsvn_ra_neon])
-    svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_NEON_DEPS)"
-    svn_ra_lib_install_deps="$svn_ra_lib_install_deps install-neon-lib"
-    svn_ra_lib_link="$svn_ra_lib_link \$(RA_NEON_LINK)"
-  fi
-
   if test "$svn_lib_serf" = "yes"; then
     AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_SERF, 1,
           [Defined if libsvn_client should link against libsvn_ra_serf])
@@ -1360,6 +1308,17 @@ AC_SUBST(JAVAHL_COMPAT_TESTS_TARGET)
 
 # ==== Miscellaneous bits ====================================================
 
+# Strip '-no-cpp-precomp' from CPPFLAGS for the clang compiler
+### I think we get this flag from APR, so the fix probably belongs there
+if test "$CC" = "clang"; then
+  CPPFLAGS=`echo "$CPPFLAGS" | $SED -e 's/-no-cpp-precomp //'`
+fi
+
+# Clang also doesn't (yet) support the '-ansi' flag
+if test "$CC" = "clang"; then
+  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-ansi //'`
+fi
+
 dnl Since this is used only on Unix-y systems, define the path separator as '/'
 AC_DEFINE_UNQUOTED(SVN_PATH_LOCAL_SEPARATOR, '/',
         [Defined to be the path separator used on your local filesystem])
@@ -1411,6 +1370,10 @@ AC_SUBST(SVN_CONFIG_SCRIPT_FILES)
 # Ensure that SWIG is checked after reconfiguration.
 rm -f .swig_checked
 
+dnl Provide ${host} for use in compiled code (for svn --version)
+AC_DEFINE_UNQUOTED([SVN_BUILD_HOST], "${host}",
+                   [Defined to the config.guess name of the build system])
+
 AC_OUTPUT
 
 # ==== Print final messages to user ==========================================
@@ -1425,9 +1388,12 @@ if test "$svn_lib_berkeley_db" = "no" &&
 
 
 You don't seem to have Berkeley DB version $db_version or newer
-installed and linked to APR-UTIL.  We have created Makefile which will build
+installed and linked to APR-UTIL.  We have created a Makefile which will build
 Subversion without support for the Berkeley DB back-end.  You can find the
 latest version of Berkeley DB here:
-  http://www.oracle.com/technology/software/products/berkeley-db/index.html
+
+  http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
+
+or explicitly specify --without-berkeley-db to silence this warning.
 ])
 fi

Modified: subversion/branches/compressed-pristines/contrib/client-side/emacs/dsvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/contrib/client-side/emacs/dsvn.el?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/branches/compressed-pristines/contrib/client-side/emacs/dsvn.el Thu Aug 16 10:17:48 2012
@@ -130,6 +130,11 @@
   :type 'boolean
   :group 'dsvn)
 
+(defcustom svn-diff-args '("-x" "-p")
+  "*Additional arguments used for all invocations of `svn diff'."
+  :type '(repeat string)
+  :group 'dsvn)
+
 ;; start-file-process and process-file are needed for tramp but only appeared
 ;; in Emacs 23 and 22 respectively.
 (setq svn-start-file-process
@@ -351,7 +356,9 @@ during the run."
   "Run `svn diff'.
 Argument ARG are the command line arguments."
   (interactive "ssvn diff arguments: ")
-  (svn-run-with-output "diff" (split-string arg) 'diff-mode))
+  (svn-run-with-output "diff"
+		       (append svn-diff-args (split-string arg))
+		       'diff-mode))
 
 (defun svn-commit ()
   "Commit changes to one or more files."
@@ -573,7 +580,7 @@ VERBOSE-P."
       (erase-buffer)
       (setq default-directory dir)
       (svn-call-process diff-buf
-                        "diff" "-r"
+                        "diff" "-x" "-p" "-r"
                         (format "%d:%d" (1- commit-id) commit-id)))))
 
 (defun svn-log-edit-files (commit-id)
@@ -601,7 +608,9 @@ VERBOSE-P."
   "Run `svn diff' for the current log entry."
   (interactive)
   (let ((commit-id (svn-log-current-commit)))
-    (svn-run-with-output "diff" (list "-c" (number-to-string commit-id))
+    (svn-run-with-output "diff"
+			 (append svn-diff-args
+				 (list "-c" (number-to-string commit-id)))
                          'diff-mode)))
 
 (defun svn-log-edit ()
@@ -1083,19 +1092,24 @@ outside."
       (goto-char (point-max))
       (insert str)
       (goto-char svn-output-marker)
-      (while (cond ((looking-at
-                     "\\([ ACDGIMRX?!~][ CM][ L][ +][ S][ KOTB]\\)[ C]? \\([^ ].*\\)\n")
-                    (let ((status (match-string 1))
-                          (filename (svn-normalise-path (match-string 2))))
-                      (delete-region (match-beginning 0)
-                                     (match-end 0))
-                      (svn-insert-file filename status))
-                    t)
-                   ((looking-at
-                     "\n\\|Performing status on external item at .*\n")
-                    (delete-region (match-beginning 0)
-                                   (match-end 0))
-                    t))))))
+      (while
+	 (cond
+	  ((looking-at
+	    "\\([ ACDGIMRX?!~][ CM][ L][ +][ S][ KOTB]\\)[ C]? \\([^ ].*\\)\n")
+	   (let ((status (match-string 1))
+		 (filename (svn-normalise-path (match-string 2))))
+	     (delete-region (match-beginning 0) (match-end 0))
+	     (svn-insert-file filename status))
+	   t)
+	  ((looking-at "\n\\|Performing status on external item at .*\n")
+	   (delete-region (match-beginning 0) (match-end 0))
+	   t)
+	  ((looking-at "      > +\\([^ ].*\\)\n")
+	   (let ((tree-conflict (match-string 1)))
+	     (delete-region (match-beginning 0) (match-end 0))
+	     (svn-update-status-msg svn-last-inserted-marker "TConflict")
+	     (svn-update-conflict-msg svn-last-inserted-marker tree-conflict))
+	   t))))))
 
 (defun svn-status-sentinel (proc reason)
   (with-current-buffer (process-buffer proc)
@@ -1110,15 +1124,23 @@ outside."
       (goto-char (point-max))
       (insert str)
       (goto-char svn-output-marker)
-      (while (looking-at
-              "\\(?:\\(\\?.....\\)\\|\\([ ACDGIMRX!~][ CM][ L][ +][ S][ KOTB]\\)[ C]? [* ] +[^ ]+ +[^ ]+ +[^ ]+\\) +\\([^ ].*\\)\n")
-        (let ((status (or (match-string 1) (match-string 2)))
-              (filename (svn-normalise-path (match-string 3))))
-          (delete-region (match-beginning 0)
-                         (match-end 0))
-	  (when (or (not svn-file-filter)
-		    (member filename svn-file-filter))
-	    (svn-insert-file filename status)))))))
+      (while
+	  (cond
+	   ((looking-at
+	     "\\(?:\\(\\?.....\\)\\|\\([ ACDGIMRX!~][ CM][ L][ +][ S][ KOTB]\\)[ C]? [* ] +[^ ]+ +[^ ]+ +[^ ]+\\) +\\([^ ].*\\)\n")
+	    (let ((status (or (match-string 1) (match-string 2)))
+		  (filename (svn-normalise-path (match-string 3))))
+	      (delete-region (match-beginning 0) (match-end 0))
+	      (when (or (not svn-file-filter)
+			(member filename svn-file-filter))
+		(svn-insert-file filename status)))
+	    t)
+	   ((looking-at "      > +\\([^ ].*\\)\n")
+	    (let ((tree-conflict (match-string 1)))
+	      (delete-region (match-beginning 0) (match-end 0))
+	      (svn-update-status-msg svn-last-inserted-marker "TConflict")
+	      (svn-update-conflict-msg svn-last-inserted-marker tree-conflict))
+	    t))))))
 
 (defun svn-status-v-sentinel (proc reason)
   (with-current-buffer (process-buffer proc)
@@ -1209,11 +1231,12 @@ With prefix arg, prompt for REVISION."
       (goto-char svn-output-marker)
       (while (not nomore)
         (cond ((looking-at
-                "\\([ ADUCGE][ ADUCGE][ B]\\)  \\(.*\\)\n")
+                "\\([ ADUCGE][ ADUCGE][ B]\\)\\([ C]?\\) \\([^ ].*\\)\n")
                (let* ((status (match-string 1))
                       (file-status (elt status 0))
                       (prop-status (elt status 1))
-                      (filename (svn-normalise-path (match-string 2))))
+		      (tree-status (match-string 2))
+                      (filename (svn-normalise-path (match-string 3))))
                  (delete-region (match-beginning 0)
                                 (match-end 0))
                  (svn-insert-file
@@ -1223,7 +1246,9 @@ With prefix arg, prompt for REVISION."
                           (svn-remap-update-to-status file-status)
                           (svn-remap-update-to-status prop-status))
                   ;; Optimize for some common cases
-                  (cond ((= prop-status ?\ )
+                  (cond ((string= tree-status "C")
+			 "TConflict")
+			((= prop-status ?\ )
                          (cdr (assq file-status svn-update-flag-name)))
                         ((= file-status ?\ )
                          (let ((s (format "P %s"
@@ -1941,7 +1966,8 @@ files instead."
                  (list (or (svn-getprop (point) 'file)
                            (svn-getprop (point) 'dir)
                            (error "No file on line"))))))
-    (unless (svn-run-with-output "diff" files 'diff-mode)
+    (unless (svn-run-with-output "diff" (append svn-diff-args files)
+				 'diff-mode)
       (message "No difference found"))))
 
 (defun svn-previous-file (arg)
@@ -2104,7 +2130,14 @@ Argument MSG is the character to use."
   (save-excursion
     (goto-char (+ pos svn-status-msg-col))
     (delete-char 9)
-    (insert-and-inherit (format "%9s" msg))))
+    (insert-and-inherit (format "%-9s" msg))))
+
+(defun svn-update-conflict-msg (pos msg)
+  (save-excursion
+    (let ((filename (svn-getprop pos 'file)))
+      (goto-char (+ pos svn-status-file-col (length filename)))
+      (delete-char (- (line-end-position) (point)))
+      (insert-and-inherit (concat " -- " msg)))))
 
 (defun svn-foreach-svn-buffer (file-name function)
   "Call FUNCTION for each svn status buffer that contains FILE-NAME.

Modified: subversion/branches/compressed-pristines/contrib/client-side/emacs/psvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/contrib/client-side/emacs/psvn.el?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/contrib/client-side/emacs/psvn.el (original)
+++ subversion/branches/compressed-pristines/contrib/client-side/emacs/psvn.el Thu Aug 16 10:17:48 2012
@@ -3575,7 +3575,7 @@ If the file is not found, return nil."
     (and found start-pos)))
 
 (defun svn-status-goto-file-name (name)
-  "Move the cursor the the line that displays NAME."
+  "Move the cursor to the line that displays NAME."
   (let ((pos (svn-status-get-file-name-buffer-position name)))
     (if pos
         (goto-char pos)

Modified: subversion/branches/compressed-pristines/contrib/client-side/emacs/vc-svn.el
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/contrib/client-side/emacs/vc-svn.el?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/contrib/client-side/emacs/vc-svn.el (original)
+++ subversion/branches/compressed-pristines/contrib/client-side/emacs/vc-svn.el Thu Aug 16 10:17:48 2012
@@ -200,9 +200,9 @@ If the file is newly added, LOCAL is \"0
     (cond
      ((not state) nil)
      ;; A newly added file has no revision.
-     ((looking-at "....\\s-+\\(\\*\\s-+\\)?[-0]\\s-+\\(\\?\\|[0-9]+\\)")
+     ((looking-at ".......\\s-+\\(\\*\\s-+\\)?[-0]\\s-+\\(\\?\\|[0-9]+\\)")
       (list state "0" nil))
-     ((looking-at "....\\s-+\\(\\*\\s-+\\)?\\([0-9]+\\)\\s-+\\([0-9]+\\)")
+     ((looking-at ".......\\s-+\\(\\*\\s-+\\)?\\([0-9]+\\)\\s-+\\([0-9]+\\)")
       (list state
             (match-string 2)
             (match-string 3)))

Modified: subversion/branches/compressed-pristines/contrib/client-side/svn-push/svn-push.c
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/contrib/client-side/svn-push/svn-push.c?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/contrib/client-side/svn-push/svn-push.c (original)
+++ subversion/branches/compressed-pristines/contrib/client-side/svn-push/svn-push.c Thu Aug 16 10:17:48 2012
@@ -147,8 +147,8 @@ check_lib_versions (void)
       { "svn_ra",     svn_ra_version },
       { NULL, NULL }
     };
-
   SVN_VERSION_DEFINE (my_version);
+
   return svn_ver_check_list (&my_version, checklist);
 }
 

Modified: subversion/branches/compressed-pristines/contrib/client-side/svnmerge/svnmerge.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/contrib/client-side/svnmerge/svnmerge.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/contrib/client-side/svnmerge/svnmerge.py (original)
+++ subversion/branches/compressed-pristines/contrib/client-side/svnmerge/svnmerge.py Thu Aug 16 10:17:48 2012
@@ -342,10 +342,13 @@ def check_dir_clean(dir):
     # Checking with -q does not show unversioned files or external
     # directories.  Though it displays a debug message for external
     # directories, after a blank line.  So, practically, the first line
-    # matters: if it's non-empty there is a modification.
+    # matters: if it's non-empty there is a modification. (Lines starting
+    # with "X" must be skipped, since they just indicate externals.)
     out = launchsvn("status -q %s" % dir)
-    if out and out[0].strip():
-        error('"%s" has local modifications; it must be clean' % dir)
+    while out and out[0].strip():
+        if not out[0].startswith("X"):
+            error('"%s" has local modifications; it must be clean' % dir)
+        out.pop(0)
 
 class PathIdentifier:
     """Abstraction for a path identifier, so that we can start talking

Modified: subversion/branches/compressed-pristines/contrib/hook-scripts/enforcer/enforcer
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/contrib/hook-scripts/enforcer/enforcer?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/contrib/hook-scripts/enforcer/enforcer (original)
+++ subversion/branches/compressed-pristines/contrib/hook-scripts/enforcer/enforcer Thu Aug 16 10:17:48 2012
@@ -129,7 +129,7 @@ configuration file "enforcer.conf".
 
 When writing hooks, it is usually easier to test the hooks on committed
 transactions already in the repository, rather than installing the
-hook and making commits to test the them.  Enforcer allows you to
+hook and making commits to test them.  Enforcer allows you to
 specify either a transaction ID (for use in a hook script) or a
 revision number (for testing).  You can then, for example, find a
 revision that you would like to have blocked (or not) and test your

Modified: subversion/branches/compressed-pristines/contrib/server-side/fsfsverify.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/contrib/server-side/fsfsverify.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/contrib/server-side/fsfsverify.py (original)
+++ subversion/branches/compressed-pristines/contrib/server-side/fsfsverify.py Thu Aug 16 10:17:48 2012
@@ -1043,7 +1043,7 @@ def fixStream(e, revFile):
       break
 
   if not m:
-    raise "Couldn't find end of rep!"
+    raise Exception("Couldn't find end of rep!")
 
   finalOffset = errorOffset + srcLength
   srcOffset = errorOffset

Modified: subversion/branches/compressed-pristines/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/gen-make.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/gen-make.py (original)
+++ subversion/branches/compressed-pristines/gen-make.py Thu Aug 16 10:17:48 2012
@@ -142,12 +142,6 @@ def _usage_exit(err=None):
   print("           look for Berkeley DB headers and libs in")
   print("           DIR")
   print("")
-  print("  --with-neon=DIR")
-  print("           the Neon sources are in DIR")
-  print("")
-  print("  --without-neon")
-  print("           Don't build Neon sources (if present)")
-  print("")
   print("  --with-serf=DIR")
   print("           the Serf sources are in DIR")
   print("")
@@ -162,11 +156,11 @@ def _usage_exit(err=None):
   print("           implies --enable-nls")
   print("")
   print("  --with-openssl=DIR")
-  print("           tell neon to look for OpenSSL headers")
+  print("           tell serf to look for OpenSSL headers")
   print("           and libs in DIR")
   print("")
   print("  --with-zlib=DIR")
-  print("           tell neon to look for ZLib headers and")
+  print("           tell Subversion to look for ZLib headers and")
   print("           libs in DIR")
   print("")
   print("  --with-jdk=DIR")
@@ -210,8 +204,11 @@ def _usage_exit(err=None):
   print("  --with-static-apr")
   print("           Use static apr and apr-util")
   print("")
+  print("  --with-static-openssl")
+  print("           Use static openssl")
+  print("")
   print("  --vsnet-version=VER")
-  print("           generate for VS.NET version VER (2002, 2003, 2005, 2008 or 2010)")
+  print("           generate for VS.NET version VER (2002, 2003, 2005, 2008, 2010 or 2012)")
   print("           [only valid in combination with '-t vcproj']")
   print("")
   print("  --with-apr_memcache=DIR")
@@ -242,8 +239,6 @@ if __name__ == '__main__':
                             'with-apr-util=',
                             'with-apr-iconv=',
                             'with-berkeley-db=',
-                            'with-neon=',
-                            'without-neon',
                             'with-serf=',
                             'with-httpd=',
                             'with-libintl=',
@@ -256,6 +251,7 @@ if __name__ == '__main__':
                             'with-sasl=',
                             'with-apr_memcache=',
                             'with-static-apr',
+                            'with-static-openssl',
                             'enable-pool-debug',
                             'enable-purify',
                             'enable-quantify',
@@ -265,6 +261,13 @@ if __name__ == '__main__':
                             'disable-shared',
                             'installed-libs=',
                             'vsnet-version=',
+
+                            # Keep distributions that help by adding a path
+                            # working. On unix this would be filtered by
+                            # configure, but on Windows gen-make.py is used
+                            # directly.
+                            'with-neon=',
+                            'without-neon',
                             ])
     if len(args) > 1:
       _usage_exit("Too many arguments")
@@ -289,6 +292,9 @@ if __name__ == '__main__':
         if opt != '--debug':
           rest.add(opt, val)
       del prev_conf
+    elif opt == '--with-neon' or opt == '--without-neon':
+      # Provide a warning that we ignored these arguments
+      print("Ignoring no longer supported argument '%s'" % opt)
     else:
       rest.add(opt, val)
 

Modified: subversion/branches/compressed-pristines/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/get-deps.sh?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/get-deps.sh (original)
+++ subversion/branches/compressed-pristines/get-deps.sh Thu Aug 16 10:17:48 2012
@@ -25,10 +25,9 @@
 
 APR=apr-1.4.6
 APR_UTIL=apr-util-1.4.1
-NEON=neon-0.29.6
 SERF=serf-1.0.1
-ZLIB=zlib-1.2.6
-SQLITE_VERSION=3.7.10
+ZLIB=zlib-1.2.7
+SQLITE_VERSION=3.7.12
 SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e "s/\./ /g"))
 
 HTTPD=httpd-2.2.22
@@ -49,35 +48,27 @@ APACHE_MIRROR=http://archive.apache.org/
 # helpers
 usage() {
     echo "Usage: $0"
-    echo "Usage: $0 [ apr | neon | serf | zlib | sqlite ] ..."
+    echo "Usage: $0 [ apr | serf | zlib | sqlite ] ..."
     exit $1
 }
 
 # getters
 get_apr() {
     cd $TEMPDIR
-    $HTTP_FETCH $APACHE_MIRROR/apr/$APR.tar.bz2
-    $HTTP_FETCH $APACHE_MIRROR/apr/$APR_UTIL.tar.bz2
+    test -d $BASEDIR/apr      || $HTTP_FETCH $APACHE_MIRROR/apr/$APR.tar.bz2
+    test -d $BASEDIR/apr-util || $HTTP_FETCH $APACHE_MIRROR/apr/$APR_UTIL.tar.bz2
     cd $BASEDIR
 
-    bzip2 -dc $TEMPDIR/$APR.tar.bz2 | tar -xf -
-    bzip2 -dc $TEMPDIR/$APR_UTIL.tar.bz2 | tar -xf -
+    test -d $BASEDIR/apr      || bzip2 -dc $TEMPDIR/$APR.tar.bz2 | tar -xf -
+    test -d $BASEDIR/apr-util || bzip2 -dc $TEMPDIR/$APR_UTIL.tar.bz2 | tar -xf -
 
-    mv $APR apr
-    mv $APR_UTIL apr-util
-}
-
-get_neon() {
-    cd $TEMPDIR
-    $HTTP_FETCH http://webdav.org/neon/$NEON.tar.gz
-    cd $BASEDIR
-
-    gzip  -dc $TEMPDIR/$NEON.tar.gz | tar -xf -
-
-    mv $NEON neon
+    test -d $BASEDIR/apr      || mv $APR apr
+    test -d $BASEDIR/apr-util || mv $APR_UTIL apr-util
 }
 
 get_serf() {
+    test -d $BASEDIR/serf && return
+
     cd $TEMPDIR
     $HTTP_FETCH http://serf.googlecode.com/files/$SERF.tar.bz2
     cd $BASEDIR
@@ -88,6 +79,8 @@ get_serf() {
 }
 
 get_zlib() {
+    test -d $BASEDIR/zlib && return
+
     cd $TEMPDIR
     $HTTP_FETCH http://www.zlib.net/$ZLIB.tar.bz2
     cd $BASEDIR
@@ -98,6 +91,8 @@ get_zlib() {
 }
 
 get_sqlite() {
+    test -d $BASEDIR/sqlite-amalgamation && return
+
     cd $TEMPDIR
     $HTTP_FETCH http://www.sqlite.org/$SQLITE.zip
     cd $BASEDIR
@@ -124,7 +119,6 @@ get_deps() {
       done
     else
       get_apr
-      get_neon
       get_serf
       get_zlib
       get_sqlite

Modified: subversion/branches/compressed-pristines/notes/authz_policy.txt
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/notes/authz_policy.txt?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/notes/authz_policy.txt (original)
+++ subversion/branches/compressed-pristines/notes/authz_policy.txt Thu Aug 16 10:17:48 2012
@@ -111,6 +111,21 @@ WHAT USERS SHOULD EXPECT FROM PATH-BASED
    This situation is quite annoying for people who can't read all the
    changed-paths.
 
+   Notice that for the purposes of gating read and write access to
+   revision properties, Subversion never considers the user's *write*
+   access to the changed-paths.  To understand the reason behind this,
+   it helps to understand why revprop access is gated at all.
+   Subversion assumes that revprops for a given revision -- especially
+   the log message (svn:log) property -- are likely to reveal paths
+   modified in that revision.  It is precisely because Subversion
+   tries not to reveal unreadable paths to users that revprop access
+   is limited as described above.  So as long as the user has the
+   requisite read access to the changed-paths, it's okay if he or she
+   lacks write access to one or more of those paths when attempting to
+   set or change revprops -- the information Subversion is trying to
+   protect through its revprop access control is considered safe to
+   reveal to that user.
+
 
 6. KNOWN LEAKAGE OF UNREADABLE PATHS