From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Mon, 10 Oct 2005 13:28:00 +0000 (+0200)
Subject: svn import: incremental imports
X-Git-Tag: v0.99.9~112^2~10
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e7e477dfacecaf362f08a65644d806da5231a9f0;p=git.git

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 896222ba..00f563da 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -244,7 +244,7 @@ EOM
 		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);
 }
@@ -557,11 +557,6 @@ sub commit {
 		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) = ('','');
@@ -593,6 +588,11 @@ sub commit {
 
 		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) = @_;