Merge branch 'maint'

* maint:
  git-cvsimport: Handle "Removed" from pserver
This commit is contained in:
Junio C Hamano 2006-05-17 22:33:06 -07:00
commit 18b01f4ff6

View File

@ -350,7 +350,7 @@ sub _line {
return $res;
} elsif($line =~ s/^E //) {
# print STDERR "S: $line\n";
} elsif($line =~ /^Remove-entry /i) {
} elsif($line =~ /^(Remove-entry|Removed) /i) {
$line = $self->readline(); # filename
$line = $self->readline(); # OK
chomp $line;