From 18dfc8c47b4fbd862cf1d2bbf245e2ff48eeb390 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 8 Jun 2009 10:01:12 +0200 Subject: [PATCH] Fix the recursing when the sub-path was modified instead of just added --- src/svn.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; -- 2.11.4.GIT