From edd866b32b651cccf12fb59645d00b4e24a6c938 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 16 Oct 2018 14:44:20 +0200 Subject: [PATCH] Discovery: Adjust the instruction in case of resolved conflict When resolving a conflict because the file was just updated on the server, we write all the metadata on the database immediatly, so INSTRUCITON_NONE is enough and UPDATE_METADATA is not needed --- src/libsync/discovery.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index c8dc6aaa1..79a53cde3 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -711,7 +711,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo( if (up._valid && up._contentChecksum == remoteChecksumHeader) { // Solve the conflict into an upload, or nothing item->_instruction = up._modtime == localEntry.modtime && up._size == localEntry.size - ? CSYNC_INSTRUCTION_UPDATE_METADATA : CSYNC_INSTRUCTION_SYNC; + ? CSYNC_INSTRUCTION_NONE : CSYNC_INSTRUCTION_SYNC; item->_direction = SyncFileItem::Up; // Update the etag and other server metadata in the journal already -- 2.30.2