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

Fixed bug where we remove file which is newer on other replica.

Browse Source
This commit is contained in:
Andreas Schneider 2008-05-15 20:15:17 +02:00
parent fce3fd8d46
commit 08e6be673b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/csync_reconcile.c
View File

@ -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 */