subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1424485 - /subversion/trunk/subversion/libsvn_client/repos_diff.c
Date Thu, 20 Dec 2012 14:24:18 GMT
Author: rhuijben
Date: Thu Dec 20 14:24:17 2012
New Revision: 1424485

URL: http://svn.apache.org/viewvc?rev=1424485&view=rev
Log:
* subversion/libsvn_client/repos_diff.c
  (make_dir_baton,
   make_file_baton): Pick more sensible default as we will at least receive
     all entry props.
  (close_file): Following up on r1424469, handle theoretical corner case.

Modified:
    subversion/trunk/subversion/libsvn_client/repos_diff.c

Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1424485&r1=1424484&r2=1424485&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Thu Dec 20 14:24:17 2012
@@ -236,7 +236,7 @@ make_dir_baton(const char *path,
   dir_baton->skip_children = FALSE;
   dir_baton->pool = dir_pool;
   dir_baton->path = apr_pstrdup(dir_pool, path);
-  dir_baton->propchanges  = apr_array_make(pool, 1, sizeof(svn_prop_t));
+  dir_baton->propchanges  = apr_array_make(pool, 8, sizeof(svn_prop_t));
   dir_baton->base_revision = base_revision;
 
   return dir_baton;
@@ -262,7 +262,7 @@ make_file_baton(const char *path,
   file_baton->skip = FALSE;
   file_baton->pool = file_pool;
   file_baton->path = apr_pstrdup(file_pool, path);
-  file_baton->propchanges  = apr_array_make(pool, 1, sizeof(svn_prop_t));
+  file_baton->propchanges  = apr_array_make(pool, 8, sizeof(svn_prop_t));
   file_baton->base_revision = edit_baton->revision;
 
   return file_baton;
@@ -988,7 +988,8 @@ close_file(void *file_baton,
           SVN_ERR(get_file_from_ra(fb, TRUE, scratch_pool));
         }
 
-      remove_non_prop_changes(fb->pristine_props, fb->propchanges);
+      if (! fb->pristine_props)
+        remove_non_prop_changes(fb->pristine_props, fb->propchanges);
 
       get_file_mime_types(&mimetype1, &mimetype2, fb);
 



Mime
View raw message