summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Sasha Khapyorsky <sashak@voltaire.com>2007-01-08 04:22:42 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2007-01-07 18:20:19 -0800
commit692167774a4fc55cd7ffd91117b2c0ac44e064d9 (patch)
tree5b0f301690d6f1ff210dde0ad4604942b991d451
parentcvsimport: skip commits that are too recent (diff)
downloadtgif-692167774a4fc55cd7ffd91117b2c0ac44e064d9.tar.xz
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>
-rwxr-xr-xgit-svnimport.perl4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-svnimport.perl b/git-svnimport.perl
index afbbe63c62..f1f1a7dbed 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;