Author: julianfoad
Date: Mon Jan 26 19:17:14 2015
New Revision: 1654876
URL: http://svn.apache.org/r1654876
Log:
Fix issue #4553 "dumpfile has wrong node kind in delete record", by omitting
the node kind from the 'delete' record in this case just like we omit it
from the 'delete' record in non-replace cases. This applies to 'svnadmin
dump' and 'svnrdump dump'.
* subversion/libsvn_repos/dump.c,
subversion/svnrdump/dump_editor.c
(dump_node_delete): Remove support for the node kind.
(dump_node): Don't pass the node kind to dump_node_delete().
Modified:
subversion/trunk/subversion/libsvn_repos/dump.c
subversion/trunk/subversion/svnrdump/dump_editor.c
Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1654876&r1=1654875&r2=1654876&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Mon Jan 26 19:17:14 2015
@@ -1002,7 +1002,6 @@ check_mergeinfo_normalization(const char
static svn_error_t *
dump_node_delete(svn_stream_t *stream,
const char *node_relpath,
- svn_node_kind_t kind,
apr_pool_t *pool)
{
apr_array_header_t *headers = svn_repos__dumpfile_headers_create(pool);
@@ -1011,14 +1010,6 @@ dump_node_delete(svn_stream_t *stream,
svn_repos__dumpfile_header_push(
headers, SVN_REPOS_DUMPFILE_NODE_PATH, node_relpath);
- /* Node-kind: "file" | "dir" */
- if (kind == svn_node_file)
- svn_repos__dumpfile_header_push(
- headers, SVN_REPOS_DUMPFILE_NODE_KIND, "file");
- else if (kind == svn_node_dir)
- svn_repos__dumpfile_header_push(
- headers, SVN_REPOS_DUMPFILE_NODE_KIND, "dir");
-
/* Node-action: delete */
svn_repos__dumpfile_header_push(
headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "delete");
@@ -1184,7 +1175,7 @@ dump_node(struct edit_baton *eb,
/* ### Unusually, we end this 'delete' node record with only a single
blank line after the header block -- no extra blank line. */
- SVN_ERR(dump_node_delete(eb->stream, path, kind, pool));
+ SVN_ERR(dump_node_delete(eb->stream, path, pool));
/* The remaining action is a non-replacing add-with-history */
/* action = svn_node_action_add; */
Modified: subversion/trunk/subversion/svnrdump/dump_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1654876&r1=1654875&r2=1654876&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/dump_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/dump_editor.c Mon Jan 26 19:17:14 2015
@@ -275,8 +275,6 @@ do_dump_newlines(struct dump_edit_baton
static svn_error_t *
dump_node_delete(svn_stream_t *stream,
const char *node_relpath,
- struct dir_baton *db,
- struct file_baton *fb,
apr_pool_t *pool)
{
apr_array_header_t *headers = svn_repos__dumpfile_headers_create(pool);
@@ -287,14 +285,6 @@ dump_node_delete(svn_stream_t *stream,
svn_repos__dumpfile_header_push(
headers, SVN_REPOS_DUMPFILE_NODE_PATH, node_relpath);
- /* Node-kind: "file" | "dir" */
- if (fb)
- svn_repos__dumpfile_header_push(
- headers, SVN_REPOS_DUMPFILE_NODE_KIND, "file");
- else if (db)
- svn_repos__dumpfile_header_push(
- headers, SVN_REPOS_DUMPFILE_NODE_KIND, "dir");
-
/* Node-action: delete */
svn_repos__dumpfile_header_push(
headers, SVN_REPOS_DUMPFILE_NODE_ACTION, "delete");
@@ -401,7 +391,7 @@ dump_node(struct dump_edit_baton *eb,
/* ### Unusually, we end this 'delete' node record with only a single
blank line after the header block -- no extra blank line. */
- SVN_ERR(dump_node_delete(eb->stream, repos_relpath, db, fb, pool));
+ SVN_ERR(dump_node_delete(eb->stream, repos_relpath, pool));
/* The remaining action is a non-replacing add-with-history */
/* action = svn_node_action_add; */
