From: Thiago Macieira <thiago@cassini.local.lan>
Date: Mon, 24 Dec 2007 22:36:27 +0000 (-0200)
Subject: s,/,_, in the output filenames in dry-run mode
X-Git-Url: http://andersk.mit.edu/gitweb/svn-all-fast-export.git/commitdiff_plain/295db4b22a8ec04897f11aef2b54110522b22ff2

s,/,_, in the output filenames in dry-run mode
---

diff --git a/src/repository.cpp b/src/repository.cpp
index 1a422f8..cd2b414 100644
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -131,7 +131,9 @@ void Repository::startFastImport()
         fastImport.setProcessChannelMode(QProcess::ForwardedChannels);
         fastImport.start("git-fast-import", QStringList());
 #else
-        fastImport.setStandardOutputFile(name);
+        QString outputFile = name;
+        outputFile.replace('/', '_');
+        fastImport.setStandardOutputFile(outputFile);
         fastImport.start("/bin/cat", QStringList());
 #endif
     }
diff --git a/src/svn.cpp b/src/svn.cpp
index 73e7cb4..b283ba0 100644
--- a/src/svn.cpp
+++ b/src/svn.cpp
@@ -456,7 +456,7 @@ int SvnRevision::exportEntry(const char *key, const svn_fs_path_change_t *change
 
     // is this a directory?
     svn_boolean_t is_dir;
-    SVN_ERR(svn_fs_is_dir(&is_dir, fs_root, key, pool));
+    SVN_ERR(svn_fs_is_dir(&is_dir, fs_root, key, revpool));
     if (is_dir) {
         if (path_from == NULL) {
             // no, it's a new directory being added
@@ -494,7 +494,7 @@ int SvnRevision::exportEntry(const char *key, const svn_fs_path_change_t *change
         }
     }
 
-    if (wasDir(fs, revnum - 1, key, pool)) {
+    if (wasDir(fs, revnum - 1, key, revpool)) {
         qDebug() << current << "was a directory; ignoring";
     } else if (change->change_kind == svn_fs_path_change_delete) {
         qDebug() << current << "is being deleted but I don't know anything about it; ignoring";