You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by hw...@apache.org on 2012/02/07 22:20:55 UTC

svn commit: r1241631 - /subversion/trunk/subversion/libsvn_delta/editor.c

Author: hwright
Date: Tue Feb  7 21:20:54 2012
New Revision: 1241631

URL: http://svn.apache.org/viewvc?rev=1241631&view=rev
Log:
Ev2: complete() and abort() should be mutually exclusive.

* subversion/libsvn_delta/editor.c
  (svn_editor_complete): Unconditionally mark the edit as "done".

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=1241631&r1=1241630&r2=1241631&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/editor.c (original)
+++ subversion/trunk/subversion/libsvn_delta/editor.c Tue Feb  7 21:20:54 2012
@@ -630,8 +630,7 @@ svn_editor_complete(svn_editor_t *editor
   if (editor->funcs.cb_complete)
     err = editor->funcs.cb_complete(editor->baton, editor->scratch_pool);
 #ifdef ENABLE_ORDERING_CHECK
-  if (!err)
-    editor->finished = TRUE;
+  editor->finished = TRUE;
 #endif
   svn_pool_clear(editor->scratch_pool);
   return err;