Mercurial > hg > dav / file diff

--- a/dav/sync.h	Thu Mar 28 14:18:54 2019 +0100
+++ b/dav/sync.h	Thu Mar 28 18:09:31 2019 +0100
@@ -73,7 +73,7 @@
     REMOTE_CHANGE_DELETED,
     REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED,
     REMOTE_CHANGE_METADATA,
-    REMOTE_CHANGE_MKDIR
+    REMOTE_CHANGE_MKDIR,
 };
 typedef enum RemoteChangeType RemoteChangeType;
 
@@ -81,7 +81,7 @@
     DavResource      *resource;
     RemoteChangeType type;
 } RemoteChange;
-    
+
 void print_usage(char *cmd);
 
 pthread_t start_sighandler(pthread_mutex_t *mutex) ;
@@ -109,7 +109,7 @@
         int *counter);
 int sync_remove_local_resource(SyncDirectory *dir, LocalResource *res);
 int sync_remove_local_directory(SyncDirectory *dir, LocalResource *res);
-void rename_conflict_file(SyncDirectory *dir, SyncDatabase *db, char *path);
+void rename_conflict_file(SyncDirectory *dir, SyncDatabase *db, char *path, DavBool copy);
 char* create_tmp_download_path(char *path);
 void move_to_trash(SyncDirectory *dir, char *path);
 
@@ -165,6 +165,8 @@
         DavResource *res,
         LocalResource *local);
 
+void update_parts(LocalResource *local, UcxList *updates, uint64_t numparts);
+
 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db);
 
 int cmd_resolve_conflicts(CmdArgs *args);