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

diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index 01b6ded400dace5d7d91605de3d57ffd158d6730..08d136b8cc5ccdeb858eeb60c4ad4b2e42939aab 100644 (file)
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -46,7 +46,7 @@ static struct {
 
 static struct {
        uint32_t revision;
-       unsigned long timestamp;
+       timestamp_t timestamp;
        struct strbuf log, author, note;
 } rev_ctx;
 
@@ -318,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);
        }
 }