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

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

Browse Source
This commit is contained in:
Junio C Hamano 2005-11-14 00:25:48 -08:00
commit 6d5410d651
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -48,7 +48,7 @@ Description: The git content addressable filesystem, GNUArch interoperability
Package: git-cvs Package: git-cvs
Architecture: all 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 Suggests: cvs
Description: The git content addressable filesystem, CVS interoperability Description: The git content addressable filesystem, CVS interoperability
This package contains 'git-cvsimport', to import development history from This package contains 'git-cvsimport', to import development history from

7
git-svnimport.perl
View File

@ -280,7 +280,8 @@ sub revert_split_path($$) {
$svnpath = "$branch_name/$branch/$path"; $svnpath = "$branch_name/$branch/$path";
} }
return $svnpath $svnpath =~ s#/+$##;
return $svnpath;
} }
sub get_file($$$) { sub get_file($$$) {
@ -372,6 +373,10 @@ sub copy_path($$$$$$$$) {
my($newrev,$newbranch,$path,$oldpath,$rev,$node_kind,$new,$parents) = @_; my($newrev,$newbranch,$path,$oldpath,$rev,$node_kind,$new,$parents) = @_;
my($srcbranch,$srcpath) = split_path($rev,$oldpath); 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 $therev = branch_rev($srcbranch, $rev);
my $gitrev = $branches{$srcbranch}{$therev}; my $gitrev = $branches{$srcbranch}{$therev};
unless($gitrev) { unless($gitrev) {