From 586cfa2aacb6234a4a9cf4ca5b034652f366e9c9 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Fri, 8 Nov 2013 10:08:49 +0100 Subject: [PATCH] Detect a NEW in the other tree, generate conflict condition. --- src/csync_reconcile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/csync_reconcile.c b/src/csync_reconcile.c index 444e8eec85..095b8b3ad5 100644 --- a/src/csync_reconcile.c +++ b/src/csync_reconcile.c @@ -146,6 +146,9 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) { other->destpath = c_strdup( cur->path ); csync_vio_set_file_id( other->file_id, cur->file_id ); cur->instruction = CSYNC_INSTRUCTION_NONE; + } else if (other->instruction == CSYNC_INSTRUCTION_NEW) { + CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "OOOO=> NEW detected in other tree!"); + cur->instruction = CSYNC_INSTRUCTION_CONFLICT; } else { cur->instruction = CSYNC_INSTRUCTION_NONE; other->instruction = CSYNC_INSTRUCTION_SYNC;