Code

git-svnimport: fix edge revisions double importing
authorSasha Khapyorsky <sashak@voltaire.com>
Mon, 8 Jan 2007 02:22:42 +0000 (04:22 +0200)
committerJunio C Hamano <junkio@cox.net>
Mon, 8 Jan 2007 02:20:19 +0000 (18:20 -0800)
This fixes newly introduced bug when the incremental cycle edge revisions
are imported twice.

Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-svnimport.perl

index afbbe63c622c29e86e3a7ac971e6f88ed93dd6a2..f1f1a7dbedcf09a5b62f49ca62029bbc9ecbec14 100755 (executable)
@@ -943,10 +943,10 @@ if ($opt_l < $current_rev) {
 print "Processing from $current_rev to $opt_l ...\n" if $opt_v;
 
 my $from_rev;
-my $to_rev = $current_rev;
+my $to_rev = $current_rev - 1;
 
 while ($to_rev < $opt_l) {
-       $from_rev = $to_rev;
+       $from_rev = $to_rev + 1;
        $to_rev = $from_rev + $repack_after;
        $to_rev = $opt_l if $opt_l < $to_rev;
        print "Fetching from $from_rev to $to_rev ...\n" if $opt_v;