svn commit: r1235973 - /subversion/trunk/subversion/libsvn_delta/compat.c

[hwright]

Author: hwright
Date: Wed Jan 25 22:35:46 2012
New Revision: 1235973

URL: http://svn.apache.org/viewvc?rev=1235973&view=rev
Log:
Ev2: Don't re-fetch the kind on an edit root.

Current number of Ev2 test failures: 25

* subversion/libsvn_delta/compat.c
  (build): Check that we're not the root before fetching an unknown node's kind.

Modified:
    subversion/trunk/subversion/libsvn_delta/compat.c

Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1235973&r1=1235972&r2=1235973&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Wed Jan 25 22:35:46 2012
@@ -988,11 +988,16 @@ build(struct editor_baton *eb,
       apr_hash_t *current_props;
       apr_array_header_t *propdiffs;
 
-      if (kind == svn_kind_unknown)
-        SVN_ERR(eb->fetch_kind_func(&operation->kind, eb->fetch_kind_baton,
-                                    relpath, rev, scratch_pool));
-      else
-        operation->kind = kind;
+      /* Only fetch the kind if operating on something other than the root,
+         as we already know the kind on the root. */
+      if (operation->path)
+        {
+          if (kind == svn_kind_unknown)
+            SVN_ERR(eb->fetch_kind_func(&operation->kind, eb->fetch_kind_baton,
+                                        relpath, rev, scratch_pool));
+          else
+            operation->kind = kind;
+        }
 
       if (operation->operation == OP_REPLACE)
         current_props = apr_hash_make(scratch_pool);