Signed-off-by: Yaacov Akiba Slama <redacted>
---
git-svnimport.perl | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
applies-to: e230cf653f1af6412e43f9b527465406bdb76ece
c38f34212ace329637fd87fb11247f6a5733e47f
diff --git a/git-svnimport.perl b/git-svnimport.perl
index 5bf9ef2..83b70f9 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -260,10 +260,17 @@ EOM
open BRANCHES,">>", "$git_dir/svn2git";
-sub get_file($$$) {
- my($rev,$branch,$path) = @_;
+sub node_kind($$$) {
+ my ($branch, $path, $revision) = @_;
+ my $pool=SVN::Pool->new;
+ my $kind = $svn->{'svn'}->check_path(revert_split_path($branch,$path),$revision,$pool);
+ $pool->clear;
+ return $kind;
+}
+
+sub revert_split_path($$) {
+ my($branch,$path) = @_;
- # revert split_path(), below
my $svnpath;
$path = "" if $path eq "/"; # this should not happen, but ...
if($branch eq "/") {@@ -274,6 +281,14 @@ sub get_file($$$) {
$svnpath = "$branch_name/$branch/$path";
}
+ return $svnpath
+}
+
+sub get_file($$$) {
+ my($rev,$branch,$path) = @_;
+
+ my $svnpath = revert_split_path($branch,$path);
+
# now get it
my $name;
if($opt_d) {---
0.99.9.GIT