undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn import: incremental imports

Browse Source 
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>
This commit is contained in:
Matthias Urlichs 2005-10-10 15:28:00 +02:00
parent 7ee74a99b2
commit e7e477dfac
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-svnimport.perl
View File

@ -244,7 +244,7 @@ EOM
my($num,$branch,$ref) = split; my($num,$branch,$ref) = split;
$branches{$branch}{$num} = $ref; $branches{$branch}{$num} = $ref;
$branches{$branch}{"LAST"} = $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) close(C)
or die "Cannot write branch $dest for update: $!\n"; 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) { if($tag) {
my($in, $out) = ('',''); 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) = @_;