From 3212a6e93eff5154dc12fca87eb6e445d003bc20 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Thu, 18 Jun 2009 21:04:47 +0200 Subject: [PATCH] Include name of SVN tree in filename of temporary data to allow concurrent updates of different trees in the same directory. Sign-off-by: Love Hornquist Astrand --- git2svn | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/git2svn b/git2svn index 3a5677d..7a43e8e 100755 --- a/git2svn +++ b/git2svn @@ -212,13 +212,18 @@ mkdir ".data" unless (-d ".data"); die "cant find branch name" unless ($branch =~ m@/?([^/]+)$@); my $shortbranch = $1; -my $gitdump = ".data/git.dump-${shortbranch}"; -my $svndump = ".data/svn.dump-${shortbranch}"; -my $log = ".data/log-${shortbranch}"; - my $gittree = $ARGV[0]; $svntree = $ARGV[1]; +# create an identifier by replacing path separators +# (i.e. "/", ":" and "\") with underscores +my $svntree_id = $svntree; +$svntree_id =~ s/[\/:\\]/_/g; + +my $gitdump = ".data/git.dump-${svntree_id}-${shortbranch}"; +my $svndump = ".data/svn.dump-${svntree_id}-${shortbranch}"; +my $log = ".data/log-${svntree_id}-${shortbranch}"; + parse_git_tree($gittree, $branch, $shortbranch); my $cwd = `pwd`; -- 2.11.4.GIT