subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1208787 - /subversion/trunk/subversion/libsvn_delta/compat.c
Date Wed, 30 Nov 2011 21:15:13 GMT
Author: hwright
Date: Wed Nov 30 21:15:12 2011
New Revision: 1208787

URL: http://svn.apache.org/viewvc?rev=1208787&view=rev
Log:
Ev2 shims: be sure we call close directory on our root baton.  This improves
correctness but causes a bunch more tests to fail.

Current number of test failures: 1198

* subversion/libsvn_delta/compat.c
  (complete_cb): After the editor drive, call close_directory on the root
    baton before closing the edit.

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=1208787&r1=1208786&r2=1208787&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Wed Nov 30 21:15:12 2011
@@ -1384,7 +1384,13 @@ complete_cb(void *baton,
   /* Drive the tree we've created. */
   err = drive_tree(&eb->root, eb->deditor, eb->make_abs_paths, scratch_pool);
   if (!err)
-     err = eb->deditor->close_edit(eb->dedit_baton, scratch_pool);
+     {
+       err = eb->deditor->close_directory(eb->root.baton, scratch_pool);
+       err = svn_error_compose_create(err, eb->deditor->close_edit(
+                                                            eb->dedit_baton,
+                                                            scratch_pool));
+     }
+
   if (err)
     svn_error_clear(eb->deditor->abort_edit(eb->dedit_baton, scratch_pool));
 



Mime
View raw message