From aad3e146fc3678a8ea4945ac784d9238a8cb04a3 Mon Sep 17 00:00:00 2001 From: Christian Jann Date: Tue, 12 Apr 2011 10:09:41 +0200 Subject: [PATCH] set instruction after conflict backup for the statedb merger to NONE --- src/csync_propagate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/csync_propagate.c b/src/csync_propagate.c index 03a54d1895..36ac90ddce 100644 --- a/src/csync_propagate.c +++ b/src/csync_propagate.c @@ -478,10 +478,8 @@ static int _csync_backup_file(CSYNC *ctx, csync_file_stat_t *st) { /* set instruction for the statedb merger */ - //st->instruction = CSYNC_INSTRUCTION_UPDATED; - st->instruction = CSYNC_INSTRUCTION_RENAME; - //maybe updated and change url to the new one - + st->instruction = CSYNC_INSTRUCTION_NONE; + CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "file: %s, instruction: CONFLICT_BACKUP", duri); rc = 0;