svn import: incremental imports

Incremental imports skipped a revision.

Also improve interrupt safety -- ^C while writing a tag caused the tag
to be skipped.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>

diff --git a/git-svnimport.perl b/git-svnimport.perl
index 896222ba741e983b3f7b76feaeae268b250ace92..00f563daec02149583cb4b1db2c3a8d679e1c6ed 100755 (executable)
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -244,7 +244,7 @@ ($$)
                my($num,$branch,$ref) = split;
                $branches{$branch}{$num} = $ref;
                $branches{$branch}{"LAST"} = $ref;
                my($num,$branch,$ref) = split;
                $branches{$branch}{$num} = $ref;
                $branches{$branch}{"LAST"} = $ref;

-               $current_rev = $num+1 if $current_rev < $num+1;
+               $current_rev = $num if $current_rev < $num;

        }
        close($B);
 }
        }
        close($B);
 }


@@ -557,11 +557,6 @@ sub commit {
                close(C)
                        or die "Cannot write branch $dest for update: $!\n";
        }
                close(C)
                        or die "Cannot write branch $dest for update: $!\n";
        }

-       $branches{$branch}{"LAST"} = $cid;
-       $branches{$branch}{$revision} = $cid;
-       $last_rev = $cid;
-       print BRANCHES "$revision $branch $cid\n";
-       print "DONE: $revision $dest $cid\n" if $opt_v;

 
        if($tag) {
                my($in, $out) = ('','');
 
        if($tag) {
                my($in, $out) = ('','');


@@ -593,6 +588,11 @@ sub commit {
 
                print "Created tag '$dest' on '$branch'\n" if $opt_v;
        }
 
                print "Created tag '$dest' on '$branch'\n" if $opt_v;
        }

+       $branches{$branch}{"LAST"} = $cid;
+       $branches{$branch}{$revision} = $cid;
+       $last_rev = $cid;
+       print BRANCHES "$revision $branch $cid\n";
+       print "DONE: $revision $dest $cid\n" if $opt_v;

 }
 
 my ($changed_paths, $revision, $author, $date, $message, $pool) = @_;
 }
 
 my ($changed_paths, $revision, $author, $date, $message, $pool) = @_;