From 08e6be673b07e07d7489763975733c4d8203f4a0 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 15 May 2008 20:15:17 +0200 Subject: [PATCH] Fixed bug where we remove file which is newer on other replica. --- src/csync_reconcile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/csync_reconcile.c b/src/csync_reconcile.c index 1aa9e5db3a..e98b0b2cb3 100644 --- a/src/csync_reconcile.c +++ b/src/csync_reconcile.c @@ -98,7 +98,7 @@ static int csync_merge_algorithm_visitor(void *obj, void *data) { cur->instruction = CSYNC_INSTRUCTION_SYNC; } else { /* file on opposite replica is newer */ - cur->instruction = CSYNC_INSTRUCTION_REMOVE; + cur->instruction = CSYNC_INSTRUCTION_NONE; } break; /* file on the other replica has not been modified */ @@ -127,7 +127,7 @@ static int csync_merge_algorithm_visitor(void *obj, void *data) { cur->instruction = CSYNC_INSTRUCTION_SYNC; } else { /* file on opposite replica is newer */ - cur->instruction = CSYNC_INSTRUCTION_REMOVE; + cur->instruction = CSYNC_INSTRUCTION_NONE; } break; /* file on the other replica has not been modified */