Merge branch 'svnup' of http://netz.smurf.noris.de/git/git

git-mirror · Nov 14, 2005 · 6d5410d · 6d5410d
2 parents 0086e2c + 4b1ca25
commit 6d5410d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/debian/control b/debian/control
@@ -48,7 +48,7 @@ Description: The git content addressable filesystem, GNUArch interoperability
 
 Package: git-cvs
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core, cvsps (>= 2.1)
 Suggests: cvs
 Description: The git content addressable filesystem, CVS interoperability
  This package contains 'git-cvsimport', to import development history from

diff --git a/git-svnimport.perl b/git-svnimport.perl
@@ -280,7 +280,8 @@ ($$)
 		$svnpath = "$branch_name/$branch/$path";
 	}
 
-	return $svnpath
+	$svnpath =~ s#/+$##;
+	return $svnpath;
 }
 
 sub get_file($$$) {
@@ -372,6 +373,10 @@ ($$$$$$$$)
 	my($newrev,$newbranch,$path,$oldpath,$rev,$node_kind,$new,$parents) = @_;
 
 	my($srcbranch,$srcpath) = split_path($rev,$oldpath);
+	unless(defined $srcbranch) {
+		print "Path not found when copying from $oldpath @ $rev\n";
+		return;
+	}
 	my $therev = branch_rev($srcbranch, $rev);
 	my $gitrev = $branches{$srcbranch}{$therev};
 	unless($gitrev) {