From: alex-z Date: Thu, 23 Dec 2021 14:04:44 +0000 (+0200) Subject: Do not display 'Conflict when uploading some files to a folder X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~17^2~214^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=77d7a0b7edb127ae85d637ad4c46c95b0abd3418;p=nextcloud-desktop.git Do not display 'Conflict when uploading some files to a folder Signed-off-by: alex-z --- diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index 605bb1a0b..01cd608cd 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -1060,9 +1060,8 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo( if (!isFilePlaceHolder && !isOnlineOnlyFolder) { if (localEntry.isDirectory && folderPlaceHolderAvailability.isValid() && !isOnlineOnlyFolder) { - // a VFS folder but is not online0only (has some files hydrated) + // a VFS folder but is not online-only (has some files hydrated) qCInfo(lcDisco) << "Virtual directory without db entry for" << path._local << "but it contains hydrated file(s), so let's keep it and reupload."; - emit _discoveryData->addErrorToGui(SyncFileItem::SoftError, tr("Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!"), path._local); return; } qCWarning(lcDisco) << "Virtual file without db entry for" << path._local