svn commit: r1657455 - in /subversion/branches/reuse-ra-session: ./ build/run_tests.py subversion/svnsync/sync.c

[brane]

Author: brane
Date: Thu Feb  5 01:07:07 2015
New Revision: 1657455

URL: http://svn.apache.org/r1657455
Log:
On the reuse-ra-session branch: Sync with trunk up to r1657454.

Modified:
    subversion/branches/reuse-ra-session/   (props changed)
    subversion/branches/reuse-ra-session/build/run_tests.py
    subversion/branches/reuse-ra-session/subversion/svnsync/sync.c

Propchange: subversion/branches/reuse-ra-session/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  5 01:07:07 2015
@@ -87,4 +87,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1501802-1657328
+/subversion/trunk:1501802-1657454

Modified: subversion/branches/reuse-ra-session/build/run_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/run_tests.py?rev=1657455&r1=1657454&r2=1657455&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/run_tests.py (original)
+++ subversion/branches/reuse-ra-session/build/run_tests.py Thu Feb  5 01:07:07 
2015
@@ -398,9 +398,11 @@ class TestHarness:
 
       # Enable access for http
       if self.base_url.startswith('http'):
-        open(os.path.join(self.builddir, subdir, 'authz'), 'w').write(
-                '[/]\n' +
-                '* = rw\n')
+        authzparent = os.path.join(self.builddir, subdir)
+        if not os.path.exists(authzparent):
+          os.makedirs(authzparent);
+        open(os.path.join(authzparent, 'authz'), 'w').write('[/]\n'
+                                                            '* = rw\n')
 
     # ### Support --repos-template
     if self.verbose is not None:

Modified: subversion/branches/reuse-ra-session/subversion/svnsync/sync.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/svnsync/sync.c?rev=1657455&r1=1657454&r2=1657455&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/svnsync/sync.c (original)
+++ subversion/branches/reuse-ra-session/subversion/svnsync/sync.c Thu Feb  5 
01:07:07 2015
@@ -509,7 +509,7 @@ change_file_prop(void *file_baton,
       SVN_ERR(normalize_string(&value, &was_normalized,
                                eb->source_prop_encoding, pool, pool));
       /* Correct malformed mergeinfo. */
-      if (strcmp(name, SVN_PROP_MERGEINFO) == 0)
+      if (value && strcmp(name, SVN_PROP_MERGEINFO) == 0)
         {
           SVN_ERR(remove_r0_mergeinfo(&value, &mergeinfo_tweaked,
                                       pool, pool));
@@ -619,7 +619,7 @@ change_dir_prop(void *dir_baton,
       SVN_ERR(normalize_string(&value, &was_normalized, 
eb->source_prop_encoding,
                                pool, pool));
       /* Maybe adjust svn:mergeinfo. */
-      if (strcmp(name, SVN_PROP_MERGEINFO) == 0)
+      if (value && strcmp(name, SVN_PROP_MERGEINFO) == 0)
         {
           SVN_ERR(remove_r0_mergeinfo(&value, &mergeinfo_tweaked,
                                       pool, pool));