svn commit: r1657401 - /subversion/trunk/subversion/svnsync/sync.c

[julianfoad]

Author: julianfoad
Date: Wed Feb  4 21:21:03 2015
New Revision: 1657401

URL: http://svn.apache.org/r1657401
Log:
Fix 'svnsync' stripping out r0 mergeinfo following r1646250, r1656893, r1657182,
r1657195. It failed an assertion when deleting a mergeinfo property.

* subversion/svnsync/sync.c
  (change_file_prop,
   change_dir_prop): Don't try to strip a null value.

Modified:
    subversion/trunk/subversion/svnsync/sync.c

Modified: subversion/trunk/subversion/svnsync/sync.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/sync.c?rev=1657401&r1=1657400&r2=1657401&view=diff
==============================================================================
--- subversion/trunk/subversion/svnsync/sync.c (original)
+++ subversion/trunk/subversion/svnsync/sync.c Wed Feb  4 21:21:03 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));