Merge commit 'refs/merge-requests/1' of git://gitorious.org/~marcguenther/svn2git/marcguenther-svn2git into integration

3 files changed, 3 insertions, 3 deletions

diff --git a/src/repository.cpp b/src/repository.cpp
index bb7002e..be73df6 100644
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -67,7 +67,7 @@ Repository::Repository(const Rules::Repository &rule)
     fastImport.setWorkingDirectory(name);
     if (!CommandLineParser::instance()->contains("dry-run")) {
         if (!QDir(name).exists()) { // repo doesn't exist yet.
-            qDebug() << "Creating new repositoryn" << name;
+            qDebug() << "Creating new repository" << name;
             QDir::current().mkpath(name);
             QProcess init;
             init.setWorkingDirectory(name);
diff --git a/src/ruleparser.cpp b/src/ruleparser.cpp
index 905115c..9a83203 100644
--- a/src/ruleparser.cpp
+++ b/src/ruleparser.cpp
@@ -44,7 +44,7 @@ void Rules::load()
 {
     QFile file(filename);
     if (!file.open(QIODevice::ReadOnly))
-        return;
+        qFatal("Could not read the rules file: %s", qPrintable(filename));
 
     // initialize the regexps we will use
     QRegExp repoLine("create repository\\s+(\\S+)", Qt::CaseInsensitive);
diff --git a/src/svn.cpp b/src/svn.cpp
index 22ee151..2a9ffcb 100644
--- a/src/svn.cpp
+++ b/src/svn.cpp
@@ -325,7 +325,7 @@ static int recursiveDumpDir(Repository::Transaction *txn, svn_fs_root_t *fs_root
 
         svn_fs_dirent_t *dirent = reinterpret_cast<svn_fs_dirent_t *>(value);
         QByteArray entryName = pathname + '/' + dirent->name;
-        QString entryFinalName = finalPathName + dirent->name;
+        QString entryFinalName = finalPathName + QString::fromUtf8(dirent->name);
 
         if (dirent->kind == svn_node_dir) {
             entryFinalName += '/';