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

[gs...@apache.org]

Author: gstein
Date: Wed Feb 15 22:20:48 2012
New Revision: 1244763

URL: http://svn.apache.org/viewvc?rev=1244763&view=rev
Log:
Ev2 work:

As a followup to r1244593, fix the validation code to understand that
children can be added with a copy or a move, not just add_*.

Current number of Ev2 test failures: 8
  (the same count before my big change/breakage in r1241748, when I
   tightened up add_directory to force callers to provide all future
   added children)

* subversion/libsvn_delta/editor.c:
  (svn_editor_copy, svn_editor_move): use CLEAR_INCOMPLETE on the
    destination node. if that destination was recorded as an
    incomplete child, then this clears it from that still-incomplete
    hash table.

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=1244763&r1=1244762&r2=1244763&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/editor.c (original)
+++ subversion/trunk/subversion/libsvn_delta/editor.c Wed Feb 15 22:20:48 2012
@@ -632,6 +632,7 @@ svn_editor_copy(svn_editor_t *editor,
                                 editor->scratch_pool);
 
   MARK_ALLOW_ALTER(editor, dst_relpath);
+  CLEAR_INCOMPLETE(editor, dst_relpath);
 
   svn_pool_clear(editor->scratch_pool);
   return err;
@@ -661,6 +662,7 @@ svn_editor_move(svn_editor_t *editor,
 
   MARK_ALLOW_ADD(editor, src_relpath);
   MARK_ALLOW_ALTER(editor, dst_relpath);
+  CLEAR_INCOMPLETE(editor, dst_relpath);
 
   svn_pool_clear(editor->scratch_pool);
   return err;