comparison: dav/sync.c
dav/sync.c
- changeset 374
- 38ae05d46f9a
- parent 372
- 2e15ff88a0ab
- child 377
- d6d7c16dd066
equal
deleted
inserted
replaced
| 373:dcc03142eb5f | 374:38ae05d46f9a |
|---|---|
| 1367 if(dir->tagconfig->conflict != TAG_NO_CONFLICT) { | 1367 if(dir->tagconfig->conflict != TAG_NO_CONFLICT) { |
| 1368 DavBool tags_changed = FALSE; | 1368 DavBool tags_changed = FALSE; |
| 1369 UcxList *local_tags = sync_get_file_tags(dir, local, &tags_changed); | 1369 UcxList *local_tags = sync_get_file_tags(dir, local, &tags_changed); |
| 1370 if(tags_changed) { | 1370 if(tags_changed) { |
| 1371 switch(dir->tagconfig->conflict) { | 1371 switch(dir->tagconfig->conflict) { |
| 1372 case TAG_NO_CONFLICT: | |
| 1372 case TAG_KEEP_LOCAL: { | 1373 case TAG_KEEP_LOCAL: { |
| 1373 store_empty_tags = TRUE; | 1374 store_empty_tags = TRUE; |
| 1374 tags = local_tags; | 1375 tags = local_tags; |
| 1375 // TODO: free tags | 1376 // TODO: free tags |
| 1376 break; | 1377 break; |
