|
|
|
@ -225,15 +225,15 @@ static void handle_node(void)
@@ -225,15 +225,15 @@ static void handle_node(void)
|
|
|
|
|
if (have_text || have_props || node_ctx.srcRev) |
|
|
|
|
die("invalid dump: deletion node has " |
|
|
|
|
"copyfrom info, text, or properties"); |
|
|
|
|
repo_delete(node_ctx.dst.buf); |
|
|
|
|
svn_repo_delete(node_ctx.dst.buf); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if (node_ctx.action == NODEACT_REPLACE) { |
|
|
|
|
repo_delete(node_ctx.dst.buf); |
|
|
|
|
svn_repo_delete(node_ctx.dst.buf); |
|
|
|
|
node_ctx.action = NODEACT_ADD; |
|
|
|
|
} |
|
|
|
|
if (node_ctx.srcRev) { |
|
|
|
|
repo_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf); |
|
|
|
|
svn_repo_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf); |
|
|
|
|
if (node_ctx.action == NODEACT_ADD) |
|
|
|
|
node_ctx.action = NODEACT_CHANGE; |
|
|
|
|
} |
|
|
|
@ -249,7 +249,7 @@ static void handle_node(void)
@@ -249,7 +249,7 @@ static void handle_node(void)
|
|
|
|
|
old_data = NULL; |
|
|
|
|
} else if (node_ctx.action == NODEACT_CHANGE) { |
|
|
|
|
uint32_t mode; |
|
|
|
|
old_data = repo_read_path(node_ctx.dst.buf, &mode); |
|
|
|
|
old_data = svn_repo_read_path(node_ctx.dst.buf, &mode); |
|
|
|
|
if (mode == REPO_MODE_DIR && type != REPO_MODE_DIR) |
|
|
|
|
die("invalid dump: cannot modify a directory into a file"); |
|
|
|
|
if (mode != REPO_MODE_DIR && type == REPO_MODE_DIR) |
|
|
|
|