svn commit: r1312073 - /subversion/branches/inheritable-props/subversion/libsvn_fs_fs/tree.c

[pburba]

Author: pburba
Date: Wed Apr 11 02:32:23 2012
New Revision: 1312073

URL: http://svn.apache.org/viewvc?rev=1312073&view=rev
Log:
On the inheritable-props branch:

* subversion/libsvn_fs_fs/tree.c
  (svn_sorts.h): New include.

  (fs_node_proplist): Return a depth-first sorted array as promised.

Modified:
    subversion/branches/inheritable-props/subversion/libsvn_fs_fs/tree.c

Modified: subversion/branches/inheritable-props/subversion/libsvn_fs_fs/tree.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/inheritable-props/subversion/libsvn_fs_fs/tree.c?rev=1312073&r1=1312072&r2=1312073&view=diff
==============================================================================
--- subversion/branches/inheritable-props/subversion/libsvn_fs_fs/tree.c 
(original)
+++ subversion/branches/inheritable-props/subversion/libsvn_fs_fs/tree.c Wed 
Apr 11 02:32:23 2012
@@ -49,6 +49,7 @@
 #include "svn_mergeinfo.h"
 #include "svn_fs.h"
 #include "svn_props.h"
+#include "svn_sorts.h"
 
 #include "fs.h"
 #include "key-gen.h"
@@ -1051,8 +1052,8 @@ fs_node_proplist(apr_hash_t **table_p,
               i_props->path_or_url =
                 apr_pstrdup(result_pool, parent_path + 1);
               i_props->prop_hash = parent_properties;
-              APR_ARRAY_PUSH(*inherited_props,
-                             svn_prop_inherited_item_t *) = i_props;
+              /* Build the output array in depth-first order. */
+              svn_sort__array_insert(&i_props, *inherited_props, 0);
             }
         }
     }