Fixes syncing in sub directories.

Signed-off-by: Camila San <[email protected]>
nextcloud · Feb 4, 2019 · 706cfe8 · 706cfe8 · PraMiD · Feb 24, 2020
1 parent 653c10b
commit 706cfe8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/csync/csync_reconcile.cpp b/src/csync/csync_reconcile.cpp
@@ -369,8 +369,13 @@ static void _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx)
                     cur->instruction = CSYNC_INSTRUCTION_NONE;
 					if (is_conflict)
 						other->instruction = CSYNC_INSTRUCTION_CONFLICT;
-					else
-						other->instruction = !cur->is_fuse_created_file ? CSYNC_INSTRUCTION_UPDATE_METADATA : CSYNC_INSTRUCTION_SYNC;
+					else {
+						if(other->type == ItemTypeDirectory && cur->type == ItemTypeDirectory)
+							other->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
+						else
+							other->instruction = (!cur->is_fuse_created_file) ? CSYNC_INSTRUCTION_UPDATE_METADATA : CSYNC_INSTRUCTION_SYNC;
+					}
+
                 }
 
                 break;