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

diff --git a/src/repository.cpp b/src/repository.cpp
index 1a422f8fbd45da092563be7669ae6af5e49161cf..cd2b4140f7538f755e3e08b0055748cefeab52f0 100644 (file)
--- 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 73e7cb48adc3e9a29901dd3472fd1daab474dee6..b283ba0dad3f193d1ac8131c92ddb55f8c0237d8 100644 (file)
--- 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";