vcs-svn: use mark from previous import for parent commit

barrbrain · jrn · commit dd3f42ad793b · 2011-03-07T01:43:58.000-06:00
With this patch, overlapping incremental imports work.

Signed-off-by: David Barr &lt;david.barr@cordelta.com&gt;
Signed-off-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
@@ -83,7 +83,7 @@ void fast_export_begin_commit(uint32_t revision, uint32_t author, char *log,
 		   log, gitsvnline);
 	if (!first_commit_done) {
 		if (revision > 1)
-			printf("from refs/heads/master^0\n");
+			printf("from :%"PRIu32"\n", revision - 1);
 		first_commit_done = 1;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ void fast_export_begin_commit(uint32_t revision, uint32_t author, char *log,`
`83`	`83`	`log, gitsvnline);`
`84`	`84`	`if (!first_commit_done) {`
`85`	`85`	`if (revision > 1)`
`86`		`- printf("from refs/heads/master^0\n");`
	`86`	`+ printf("from :%"PRIu32"\n", revision - 1);`
`87`	`87`	`first_commit_done = 1;`
`88`	`88`	`}`
`89`	`89`	`}`