Log Message: |
Fix issue #4551 "svnrdump load commits wrong properties, or fails, on a
non-deltas dumpfile", by teaching the svnrdump loader to find the original
properties of a copied node at the copy source location.
* subversion/svnrdump/load_editor.c
(ARE_VALID_COPY_ARGS): New macro.
(directory_baton): Add copyfrom fields.
(node_baton): Add a copyfrom URL field.
(new_revision_record): Explicitly initialize 'rb->db', for clarity, now
that we rely on it starting out as null.
(push_directory): New function, factored out of new_node_record() and
extended to store the copyfrom source of the directory.
(new_node_record): Factor out the push_directory() functionality. Store
the copyfrom URL separately from the copyfrom path. Move the variable
'relpath_compose' into a tighter scope. Tweak comments.
(remove_node_props): Look up the original properties in the copy source
even if it is implicitly copied (in other words a child of a copy).
* subversion/tests/cmdline/svnrdump_tests.py
(load_non_deltas_copy_with_props): Remove XFail marker. Extend.
(load_non_deltas_replace_copy_with_props): Remove XFail marker. Extend
a little.
|