summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-14 08:25:48 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-14 08:25:48 (GMT)
commit6d5410d65137dc76a504b550872614170e2d98b3 (patch)
tree165d0ef256abc04614367bfa1742d9f163312b5b
parent0086e2c854e3af3209915e4ec2f933bcef400050 (diff)
parent4b1ca25e429a67de4828c029b053dea637732722 (diff)
downloadgit-6d5410d65137dc76a504b550872614170e2d98b3.zip
git-6d5410d65137dc76a504b550872614170e2d98b3.tar.gz
git-6d5410d65137dc76a504b550872614170e2d98b3.tar.bz2
Merge branch 'svnup' of http://netz.smurf.noris.de/git/git
-rw-r--r--debian/control2
-rwxr-xr-xgit-svnimport.perl7
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index a77bb5d..3935e33 100644
--- 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
index cb9afb9..af13fdd 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -280,7 +280,8 @@ sub revert_split_path($$) {
$svnpath = "$branch_name/$branch/$path";
}
- return $svnpath
+ $svnpath =~ s#/+$##;
+ return $svnpath;
}
sub get_file($$$) {
@@ -372,6 +373,10 @@ sub copy_path($$$$$$$$) {
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) {