From: Sasha Khapyorsky <sashak@voltaire.com>
Date: Mon, 8 Jan 2007 02:22:42 +0000 (+0200)
Subject: git-svnimport: fix edge revisions double importing
X-Git-Tag: v1.5.0-rc1~59
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=692167774a4fc55cd7ffd91117b2c0ac44e064d9;p=git.git

git-svnimport: fix edge revisions double importing

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>
---

diff --git a/git-svnimport.perl b/git-svnimport.perl
index afbbe63c6..f1f1a7dbe 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -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;