diff options
| author | alex-z <blackslayer4@gmail.com> | 2021-12-23 17:04:44 +0300 |
|---|---|---|
| committer | Matthieu Gallien (Rebase PR Action) <matthieu_gallien@yahoo.fr> | 2022-01-07 11:46:22 +0300 |
| commit | 77d7a0b7edb127ae85d637ad4c46c95b0abd3418 (patch) | |
| tree | 2593fc42f8a1a1ed541912b6997f8f519398c119 /src/libsync/discovery.cpp | |
| parent | 263a10cb3a35ae35a8814d4965279cd8f42c033f (diff) | |
Do not display 'Conflict when uploading some files to a folder
Signed-off-by: alex-z <blackslayer4@gmail.com>
Diffstat (limited to 'src/libsync/discovery.cpp')
| -rw-r--r-- | src/libsync/discovery.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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 |