Merge branch 'dm/stash-k-i-p'

diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index 88ecef1066efe3e1d0a6a6d7a08f691321095297..bc792223b2638bce4196eb0dc6626beb32f48da4 100644 (file)
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -13,6 +13,7 @@
 #include "line_buffer.h"
 #include "string_pool.h"
 #include "strbuf.h"
+#include "svndump.h"
 
 /*
  * Compare start of string to literal of equal length;
@@ -214,7 +215,8 @@ static void handle_node(void)
                if (have_text || have_props || node_ctx.srcRev)
                        die("invalid dump: deletion node has "
                                "copyfrom info, text, or properties");
-               return repo_delete(node_ctx.dst);
+               repo_delete(node_ctx.dst);
+               return;
        }
        if (node_ctx.action == NODEACT_REPLACE) {
                repo_delete(node_ctx.dst);
@@ -274,7 +276,7 @@ static void handle_revision(void)
 {
        if (rev_ctx.revision)
                repo_commit(rev_ctx.revision, rev_ctx.author.buf,
-                       rev_ctx.log.buf, dump_ctx.uuid.buf, dump_ctx.url.buf,
+                       &rev_ctx.log, dump_ctx.uuid.buf, dump_ctx.url.buf,
                        rev_ctx.timestamp);
 }