mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

set instruction after conflict backup for the statedb merger to NONE

Browse Source
This commit is contained in:
Christian Jann 2011-04-12 10:09:41 +02:00
parent 1fbe6b6c96
commit aad3e146fc
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/csync_propagate.c
View File

@ -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;