svn commit: r982964 - in /subversion/trunk/subversion: svnrdump/load_editor.c tests/cmdline/svnrdump_tests.py

[ar...@apache.org]

Author: artagnon
Date: Fri Aug  6 13:56:42 2010
New Revision: 982964

URL: http://svn.apache.org/viewvc?rev=982964&view=rev
Log:
* subversion/svnrdump/load_editor.c
  (new_node_record): Handle the open_file case and fix the
  fall-through in the switch case statement.

* subversion/tests/cmdline/svnrdump_tests.py
  (test_list): Pass the skeleton_load and copy_and_modify_load
  tests. These were fixed by rhuijben in r982957.

Modified:
    subversion/trunk/subversion/svnrdump/load_editor.c
    subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py

Modified: subversion/trunk/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=982964&r1=982963&r2=982964&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/load_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/load_editor.c Fri Aug  6 13:56:42 2010
@@ -271,8 +271,21 @@ new_node_record(void **node_baton,
         default:
           break;
         }
+      break;
     case svn_node_action_change:
-      /* Handled in set_node_property/ delete_node_property */
+      switch (nb->kind)
+        {
+        case svn_node_file:
+          /* open_file to set the file_baton so we can apply props,
+             txdelta to it */
+          SVN_ERR(commit_editor->open_file(nb->path, rb->db->baton,
+                                           SVN_INVALID_REVNUM, rb->pool,
+                                           &(nb->file_baton)));
+          break;
+        default:
+          /* The directory baton has already been set */
+          break;
+        }
       break;
     case svn_node_action_delete:
       switch (nb->kind)
@@ -290,6 +303,7 @@ new_node_record(void **node_baton,
         default:
           break;
         }
+      break;
     case svn_node_action_replace:
       /* Absent in dumpstream; represented as a delete + add */
       break;

Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=982964&r1=982963&r2=982964&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Fri Aug  6 13:56:42 2010
@@ -175,8 +175,8 @@ test_list = [ None,
               basic_dump,
               revision_0_dump,
               revision_0_load,
-              Wimp("Response code: 501", skeleton_load, svntest.main.is_ra_type_dav),
-              Wimp("Response code: 501", copy_and_modify_load, svntest.main.is_ra_type_dav),
+              skeleton_load,
+              copy_and_modify_load,
               Wimp("Need to fix headers in RA layer", copy_and_modify_dump),
              ]