diff options
| author | Thiago Macieira <thiago@kde.org> | 2009-06-08 10:01:12 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2009-06-08 10:01:12 +0200 |
| commit | 18dfc8c47b4fbd862cf1d2bbf245e2ff48eeb390 (patch) | |
| tree | 7b4c8cf9c0da3ea520d62a967c46c358940e0438 /src | |
| parent | 7d5244f97278f85caee51626e228b2b4fa7cbb88 (diff) | |
| download | svn2git-18dfc8c47b4fbd862cf1d2bbf245e2ff48eeb390.tar svn2git-18dfc8c47b4fbd862cf1d2bbf245e2ff48eeb390.tar.gz svn2git-18dfc8c47b4fbd862cf1d2bbf245e2ff48eeb390.tar.bz2 svn2git-18dfc8c47b4fbd862cf1d2bbf245e2ff48eeb390.tar.xz svn2git-18dfc8c47b4fbd862cf1d2bbf245e2ff48eeb390.zip | |
Fix the recursing when the sub-path was modified instead of just added
Diffstat (limited to 'src')
| -rw-r--r-- | src/svn.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/svn.cpp b/src/svn.cpp index 489ef14..4bf4e9e 100644 --- a/src/svn.cpp +++ b/src/svn.cpp @@ -656,7 +656,9 @@ int SvnRevision::recurse(const char *path, const svn_fs_path_change_t *change, entryFrom = path_from + QByteArray("/") + dirent->name; // check if this entry is in the changelist for this revision already - if (apr_hash_get(changes, entry.constData(), APR_HASH_KEY_STRING)) { + svn_fs_path_change_t *otherchange = + (svn_fs_path_change_t*)apr_hash_get(changes, entry.constData(), APR_HASH_KEY_STRING); + if (otherchange && otherchange->change_kind == svn_fs_path_change_add) { qDebug() << entry << "rev" << revnum << "is in the change-list, deferring to that one"; continue; |