subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1205262 - /subversion/trunk/subversion/libsvn_delta/editor.c
Date Wed, 23 Nov 2011 01:51:10 GMT
Author: hwright
Date: Wed Nov 23 01:51:07 2011
New Revision: 1205262

URL: http://svn.apache.org/viewvc?rev=1205262&view=rev
Log:
Ev2: when enforcing ordering, don't mark the editor as completed if the
completion handler returns an error.  It is still valid to call the abort
handler in this case.

* subversion/libsvn_delta/editor.c
  (svn_editor_complete): As above.

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

Modified: subversion/trunk/subversion/libsvn_delta/editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/editor.c?rev=1205262&r1=1205261&r2=1205262&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/editor.c (original)
+++ subversion/trunk/subversion/libsvn_delta/editor.c Wed Nov 23 01:51:07 2011
@@ -605,7 +605,8 @@ svn_editor_complete(svn_editor_t *editor
 
   err = editor->funcs.cb_complete(editor->baton, editor->scratch_pool);
 #ifdef ENABLE_ORDERING_CHECK
-  editor->finished = TRUE;
+  if (!err)
+    editor->finished = TRUE;
 #endif
   svn_pool_clear(editor->scratch_pool);
   return err;



Mime
View raw message