Mercurial > hg > dav / file diff

--- a/dav/sync.h	Sat Feb 03 15:59:53 2018 +0100
+++ b/dav/sync.h	Sun Feb 04 11:14:20 2018 +0100
@@ -85,6 +85,7 @@
 int sync_remove_status(DavResource *res);
 UcxBuffer* sync_get_file_tag_data(SyncDirectory *dir, LocalResource *res);
 UcxList* sync_get_file_tags(SyncDirectory *dir, LocalResource *res, DavBool *changed);
+UcxList* sync_merge_tags(UcxList *tags1, UcxList *tags2);
 int sync_store_tags(SyncDirectory *dir, const char *path, LocalResource *local, DavResource *res);
 int sync_put_resource(
         SyncDirectory *dir,
@@ -93,6 +94,7 @@
         int *counter);
 int sync_mkdir(SyncDirectory *dir, DavResource *res, LocalResource *local);
 int sync_delete_remote_resource(DavSession *sn, LocalResource *res, int *counter);
+int sync_update_tags(SyncDirectory *dir, DavSession *sn, DavResource *res, LocalResource *local);
 
 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db);