From aabcf807744f322be5b63c966b7750a0003c8b25 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 21 Aug 2014 11:33:38 +0200 Subject: [PATCH] Sync engine: Take also in account the fact that the instruction can be IGNORE on both tree --- src/mirall/syncengine.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp index 2879bf3f9..d282df402 100644 --- a/src/mirall/syncengine.cpp +++ b/src/mirall/syncengine.cpp @@ -265,7 +265,8 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote ) item._file = fileUtf8; item._originalFile = item._file; - if (item._instruction == CSYNC_INSTRUCTION_NONE) { + if (item._instruction == CSYNC_INSTRUCTION_NONE + || (item._instruction == CSYNC_INSTRUCTION_IGNORE && file->instruction != CSYNC_INSTRUCTION_NONE)) { item._instruction = file->instruction; item._modtime = file->modtime; } else {