aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Guenther marcguenther@me.com <marcguenther@me.com>2010-04-14 22:21:17 +0200
committerMarc Guenther marcguenther@me.com <marcguenther@me.com>2010-04-14 22:21:17 +0200
commitad10c53d123ebf1c7a1d93431ade2a1cde4715ce (patch)
tree0c99815e48e0c6ddeb691b365e5af27d4eeb1891
parent1841b37e70d582b384f81a5cb51f6ab30863ea48 (diff)
parent5d9df31bf640bbbbfbb30d0163f9f2571cc1b81b (diff)
downloadsvn2git-ad10c53d123ebf1c7a1d93431ade2a1cde4715ce.tar
svn2git-ad10c53d123ebf1c7a1d93431ade2a1cde4715ce.tar.gz
svn2git-ad10c53d123ebf1c7a1d93431ade2a1cde4715ce.tar.bz2
svn2git-ad10c53d123ebf1c7a1d93431ade2a1cde4715ce.tar.xz
svn2git-ad10c53d123ebf1c7a1d93431ade2a1cde4715ce.zip
Merge remote branch 'svn2git/master'
-rw-r--r--src/repository.cpp5
-rw-r--r--src/svn.cpp5
2 files changed, 5 insertions, 5 deletions
diff --git a/src/repository.cpp b/src/repository.cpp
index df0df8f..922027d 100644
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -298,7 +298,10 @@ void Repository::Transaction::setLog(const QByteArray &l)
void Repository::Transaction::deleteFile(const QString &path)
{
- deletedFiles.append(path);
+ QString pathNoSlash = path;
+ if(pathNoSlash.endsWith('/'))
+ pathNoSlash.chop(1);
+ deletedFiles.append(pathNoSlash);
}
QIODevice *Repository::Transaction::addFile(const QString &path, int mode, qint64 length)
diff --git a/src/svn.cpp b/src/svn.cpp
index ea19be3..0c859c9 100644
--- a/src/svn.cpp
+++ b/src/svn.cpp
@@ -651,10 +651,7 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha
} else if (!current.endsWith('/')) {
dumpBlob(txn, fs_root, key, path, pool);
} else {
- QString pathNoSlash = path;
- if(pathNoSlash.endsWith('/'))
- pathNoSlash.chop(1);
- txn->deleteFile(pathNoSlash);
+ txn->deleteFile(path);
recursiveDumpDir(txn, fs_root, key, path, pool);
}