Dmitry Ivankov wrote:
> This option is to make svn-fe write commits on top of the existing ref
> instead of overwriting it. More precise, the first commit's parent is
> set to be :(first_revision_in_current_dump - 1) mark.
>
> Prerequisite is to (re)use import marks (from previous imports). It is
> safe to use this option on a svn dump that starts with r0/r1. The svn
> dump itself should be incremental too.
In other words, this allows running svn-fe to resume a partial import or
to resume an import after the remote repository has added more history.
Hoorah!
[...]
> + try_dump_ext "--incremental" "" "--export-marks=./marks" emptyprop.dump &&
> + test_line_count = 2 ./marks &&
> +
> + try_dump_ext "--incremental" "" "--import-marks=./marks --export-marks=./marks" moreempty.dump &&
> + test_line_count = 3 ./marks &&
It should be possible to avoid this extra argument by making "reinit_git"
remove the marks file and using something like
git fast-import --import-marks-if-exists=marks --export-marks=marks
> --- a/test-svn-fe.c
> +++ b/test-svn-fe.c
> @@ -22,6 +22,9 @@ static struct option test_svnfe_options[] = {
> OPT_SET_INT('d', NULL, &d, "test apply_delta", 1),
> OPT_STRING(0, "ref", &args.ref, "dst_ref",
> "write to dst_ref instead of refs/heads/master"),
> + OPT_BIT(0, "incremental", &args.incremental,
> + "resume export, requires marks and incremental dump",
> + 1),
Why OPT_BIT?
Hope that helps,
Jonathan
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html