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

[hw...@apache.org]

Author: hwright
Date: Tue Feb  7 21:22:52 2012
New Revision: 1241635

URL: http://svn.apache.org/viewvc?rev=1241635&view=rev
Log:
Revert r1241608, since it now tests for an impossible condition.

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=1241635&r1=1241634&r2=1241635&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Tue Feb  7 21:22:52 2012
@@ -986,8 +986,6 @@ struct editor_baton
   struct operation root;
   svn_boolean_t *make_abs_paths;
 
-  svn_boolean_t driven;
-
   apr_hash_t *paths;
   apr_pool_t *edit_pool;
 };
@@ -1666,7 +1664,6 @@ complete_cb(void *baton,
 
   /* Drive the tree we've created. */
   err = drive_root(&eb->root, eb->deditor, *eb->make_abs_paths, scratch_pool);
-  eb->driven = TRUE;
   if (!err)
      {
        err = svn_error_compose_create(err, eb->deditor->close_edit(
@@ -1686,16 +1683,14 @@ abort_cb(void *baton,
          apr_pool_t *scratch_pool)
 {
   struct editor_baton *eb = baton;
-  svn_error_t *err = SVN_NO_ERROR;
+  svn_error_t *err;
   svn_error_t *err2;
 
   /* We still need to drive anything we collected in the editor to this
      point. */
 
   /* Drive the tree we've created. */
-  if (!eb->driven)
-    err = drive_root(&eb->root, eb->deditor, *eb->make_abs_paths,
-                     scratch_pool);
+  err = drive_root(&eb->root, eb->deditor, *eb->make_abs_paths, scratch_pool);
 
   err2 = eb->deditor->abort_edit(eb->dedit_baton, scratch_pool);