Merge branch 'jl/submodule-add-by-name'

diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
index df51c59ca5415387d593b5a726de9fcb1bffd7dc..f2b23c81de11a63c2c1c2ac925be9081ad5bea5c 100644 (file)
--- a/vcs-svn/fast_export.c
+++ b/vcs-svn/fast_export.c
@@ -68,13 +68,19 @@ void fast_export_modify(const char *path, uint32_t mode, const char *dataref)
 }
 
 void fast_export_begin_note(uint32_t revision, const char *author,
-               const char *log, unsigned long timestamp)
+               const char *log, unsigned long timestamp, const char *note_ref)
 {
+       static int firstnote = 1;
        size_t loglen = strlen(log);
-       printf("commit refs/notes/svn/revs\n");
+       printf("commit %s\n", note_ref);
        printf("committer %s <%s@%s> %ld +0000\n", author, author, "local", timestamp);
        printf("data %"PRIuMAX"\n", (uintmax_t)loglen);
        fwrite(log, loglen, 1, stdout);
+       if (firstnote) {
+               if (revision > 1)
+                       printf("from %s^0", note_ref);
+               firstnote = 0;
+       }
        fputc('\n', stdout);
 }