diff options
author | Marc Guenther marcguenther@me.com <marcguenther@me.com> | 2010-04-14 16:04:15 +0200 |
---|---|---|
committer | Marc Guenther marcguenther@me.com <marcguenther@me.com> | 2010-04-14 16:04:15 +0200 |
commit | 1841b37e70d582b384f81a5cb51f6ab30863ea48 (patch) | |
tree | 4ec233d4d62e60bd2bda9eb846c371632f0e3342 /src/svn.cpp | |
parent | 96305273fb80f186fe8a1cf7b721e492d65624bd (diff) | |
parent | 437e0dbb1551dbce774a1c5036e17a8e30c8e699 (diff) | |
download | svn2git-1841b37e70d582b384f81a5cb51f6ab30863ea48.tar svn2git-1841b37e70d582b384f81a5cb51f6ab30863ea48.tar.gz svn2git-1841b37e70d582b384f81a5cb51f6ab30863ea48.tar.bz2 svn2git-1841b37e70d582b384f81a5cb51f6ab30863ea48.tar.xz svn2git-1841b37e70d582b384f81a5cb51f6ab30863ea48.zip |
Merge remote branch 'svn2git/master'
Conflicts:
src/svn.cpp
Diffstat (limited to 'src/svn.cpp')
-rw-r--r-- | src/svn.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/svn.cpp b/src/svn.cpp index 1bc108b..ea19be3 100644 --- a/src/svn.cpp +++ b/src/svn.cpp @@ -216,11 +216,8 @@ static void splitPathName(const Rules::Match &rule, const QString &pathName, QSt } if (path_p) { - QString path = pathName.mid(svnprefix.length()); - if( !path.isEmpty() && !rule.prefix.isEmpty() ) - path.prepend('/'); QString prefix = svnprefix.replace(rule.rx, rule.prefix); - *path_p = prefix + path; + *path_p = prefix + pathName.mid(svnprefix.length()); } } @@ -655,7 +652,8 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha dumpBlob(txn, fs_root, key, path, pool); } else { QString pathNoSlash = path; - pathNoSlash.chop(1); + if(pathNoSlash.endsWith('/')) + pathNoSlash.chop(1); txn->deleteFile(pathNoSlash); recursiveDumpDir(txn, fs_root, key, path, pool); } |