Merge branch 'dl/complete-cherry-pick-revert-skip'

diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index 41113119bdd0ded1b2654f8c141db5d25a1a2fa8..08d136b8cc5ccdeb858eeb60c4ad4b2e42939aab 100644 (file)
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -8,7 +8,6 @@
  */
 
 #include "cache.h"
-#include "repo_tree.h"
 #include "fast_export.h"
 #include "line_buffer.h"
 #include "strbuf.h"
@@ -47,7 +46,7 @@ static struct {
 
 static struct {
        uint32_t revision;
-       unsigned long timestamp;
+       timestamp_t timestamp;
        struct strbuf log, author, note;
 } rev_ctx;
 
@@ -233,7 +232,7 @@ static void handle_node(void)
                node_ctx.action = NODEACT_ADD;
        }
        if (node_ctx.srcRev) {
-               svn_repo_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf);
+               fast_export_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 +248,7 @@ static void handle_node(void)
                old_data = NULL;
        } else if (node_ctx.action == NODEACT_CHANGE) {
                uint32_t mode;
-               old_data = svn_repo_read_path(node_ctx.dst.buf, &mode);
+               old_data = fast_export_read_path(node_ctx.dst.buf, &mode);
                if (mode == S_IFDIR && type != S_IFDIR)
                        die("invalid dump: cannot modify a directory into a file");
                if (mode != S_IFDIR && type == S_IFDIR)
@@ -319,6 +318,7 @@ static void end_revision(const char *note_ref)
                strbuf_addf(&mark, ":%"PRIu32, rev_ctx.revision);
                fast_export_note(mark.buf, "inline");
                fast_export_buf_to_data(&rev_ctx.note);
+               strbuf_release(&mark);
        }
 }