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

Detect a NEW in the other tree, generate conflict condition.

Browse Source
This commit is contained in:
Klaas Freitag 2013-11-08 10:08:49 +01:00
parent 40e2e5891f
commit 586cfa2aac
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/csync_reconcile.c
View File

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