svn commit: r1092783 - in /subversion/trunk/subversion: svnrdump/dump_editor.c tests/cmdline/svnrdump_tests.py

[hw...@apache.org]

Author: hwright
Date: Fri Apr 15 18:24:39 2011
New Revision: 1092783

URL: http://svn.apache.org/viewvc?rev=1092783&view=rev
Log:
Fix issue #3847: 'svnrdump dump' generates a bogus dumpstream for nodes with
multiple propchanges in a single revision.

* subversion/tests/cmdline/svnrdump_tests.py
  (add_multi_prop_dump): Remove XFail.

* subversion/svnrdump/dump_editor.c
  (change_dir_prop): Don't dump the props immediately, but do flag them to
    be dumped eventually.

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

Modified: subversion/trunk/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1092783&r1=1092782&r2=1092783&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/dump_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/dump_editor.c Fri Apr 15 18:24:39 2011
@@ -650,10 +650,10 @@ change_dir_prop(void *parent_baton,
       db->written_out = TRUE;
     }
 
-  /* Dump props whether or not the directory has been written
-     out. Then disable printing a couple of extra newlines */
-  SVN_ERR(do_dump_props(db->eb, NULL, TRUE, pool));
+  /* Make sure we eventually output the props, and disable printing
+     a couple of extra newlines */
   db->eb->dump_newlines = FALSE;
+  db->eb->dump_props = TRUE;
 
   return SVN_NO_ERROR;
 }

Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1092783&r1=1092782&r2=1092783&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Fri Apr 15 18:24:39 2011
@@ -335,7 +335,6 @@ def descend_into_replace_load(sbox):
   "load: descending into replaced dir looks in src"
   run_load_test(sbox, "descend-into-replace.dump")
 
-@XFail()
 @Issue(3847)
 def add_multi_prop_dump(sbox):
   "dump: add with multiple props"